Merge branch 'master' into issue-vm-detail-fixes
Conflicts: circle/dashboard/tests/test_views.py
Showing
This diff is collapsed.
Click to expand it.
circle/dashboard/vm/__init__.py
0 → 100644
circle/dashboard/vm/urls.py
0 → 100644