circle/request · ceph · Gyuricska Milán / cloud

Merge branch 'master' into ceph · a97fd1bc

Conflicts:
	circle/dashboard/management/commands/init.py
	circle/dashboard/templates/dashboard/storage/detail.html
	circle/dashboard/views/vm.py
	circle/storage/models.py
	requirements/base.txt

committed Dec 11, 2017

a97fd1bc

Name	Last commit	Last Update
..
migrations		Loading commit data...
templates/request		Loading commit data...
__init__.py		Loading commit data...
forms.py		Loading commit data...
models.py		Loading commit data...
tables.py		Loading commit data...
tests.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...