circle/dashboard/templates · ef1332c626a2946d030ed7e5f65861ee9e6ccda2 · Gyuricska Milán / cloud

Merge branch 'ceph' into new_ceph · 79aeec80

Conflicts:
	circle/dashboard/views/storage.py
	circle/storage/models.py
	circle/storage/tasks/periodic_tasks.py
	circle/storage/tasks/storage_tasks.py
	circle/vm/models/instance.py

committed Jul 12, 2016

79aeec80

Name	Last commit	Last Update
..
crispy_forms		Loading commit data...
dashboard		Loading commit data...
django_tables2		Loading commit data...
base.html		Loading commit data...
branding.html		Loading commit data...
display-form-errors.html		Loading commit data...
open-graph.html		Loading commit data...