Merge branch 'master' into feature-base-template
Conflicts: circle/dashboard/templates/dashboard/template-list.html circle/dashboard/templates/dashboard/vm-detail/home.html circle/dashboard/views.py
Showing
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.