Merge branch 'master' into connect-via-client
Conflicts: circle/dashboard/templates/dashboard/vm-detail.html circle/dashboard/views.py
Showing
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Conflicts: circle/dashboard/templates/dashboard/vm-detail.html circle/dashboard/views.py