Merge branch 'master' into feature-template-wizard
Conflicts: circle/dashboard/templates/dashboard/vm-detail.html circle/dashboard/urls.py circle/dashboard/views.py
Showing
circle/dashboard/admin.py
0 → 100644
Conflicts: circle/dashboard/templates/dashboard/vm-detail.html circle/dashboard/urls.py circle/dashboard/views.py