Merge branch 'master' into feature-template-wizard
Conflicts: circle/dashboard/templates/dashboard/vm-detail.html circle/dashboard/urls.py circle/dashboard/views.py
Showing
circle/dashboard/admin.py
0 → 100644
circle/dashboard/vm/__init__.py
0 → 100644
circle/dashboard/vm/urls.py
0 → 100644
miscellaneous/nginx-uwsgi.conf
0 → 100644
miscellaneous/portal-uwsgi.conf
0 → 100644
Please
register
or
sign in
to comment