Merge branch 'master' into feature-new-tour
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/views.py
Showing
circle/dashboard/static/local-logo.png
0 → 100644
![circle/dashboard/static/local-logo.png](/fuximo/cloud/raw/df7e52cf36c86bae78a45ade4d0ebf8db9dca80a/circle/dashboard/static/local-logo.png)
5.65 KB
circle/dashboard/templates/branding.html
0 → 100644
circle/dashboard/views.py
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
circle/dashboard/views/__init__.py
0 → 100644
circle/dashboard/views/graph.py
0 → 100644
circle/dashboard/views/group.py
0 → 100644
circle/dashboard/views/index.py
0 → 100644
circle/dashboard/views/node.py
0 → 100644
circle/dashboard/views/store.py
0 → 100644
circle/dashboard/views/template.py
0 → 100644
circle/dashboard/views/user.py
0 → 100644
circle/dashboard/views/util.py
0 → 100644
circle/dashboard/views/vm.py
0 → 100644
circle/dashboard/vm/__init__.py
deleted
100644 → 0
circle/dashboard/vm/urls.py
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
Please
register
or
sign in
to comment