node.py
13.2 KB
-
Merge branch 'master' into feature-mass-ops · 207f7413
Conflicts: circle/dashboard/templates/dashboard/vm-list.html circle/dashboard/views.py
Kálmán Viktor committed
Conflicts: circle/dashboard/templates/dashboard/vm-list.html circle/dashboard/views.py