circle/dashboard/static/dashboard · eb91be586b639d9fc10f9565e043419ad9481755 · 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
..
img		Loading commit data...
js		Loading commit data...
activity.js		Loading commit data...
dashboard.js		Loading commit data...
dashboard.less		Loading commit data...
datastore-details.js		Loading commit data...
group-details.js		Loading commit data...
group-list.js		Loading commit data...
help.js		Loading commit data...
node-details.js		Loading commit data...
node-list.js		Loading commit data...
profile.js		Loading commit data...
store.js		Loading commit data...
template-list.js		Loading commit data...
vm-console.js		Loading commit data...
vm-create.js		Loading commit data...
vm-details.js		Loading commit data...
vm-list.js		Loading commit data...
vm-tour.js		Loading commit data...