test_views.py
73.1 KB
-
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
Fukász Rómeó Ervin committed