vm-list.html
6.3 KB
-
Merge branch 'master' into connect-via-client · 08a3542b
Conflicts: circle/dashboard/templates/dashboard/vm-detail.html circle/dashboard/views.py
Őry Máté committed
Conflicts: circle/dashboard/templates/dashboard/vm-detail.html circle/dashboard/views.py