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
5.65 KB
circle/dashboard/templates/branding.html
0 → 100644
This diff is collapsed.
Click to expand it.
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
This diff is collapsed.
Click to expand it.
circle/dashboard/views/index.py
0 → 100644
circle/dashboard/views/node.py
0 → 100644
This diff is collapsed.
Click to expand it.
circle/dashboard/views/store.py
0 → 100644
circle/dashboard/views/template.py
0 → 100644
This diff is collapsed.
Click to expand it.
circle/dashboard/views/user.py
0 → 100644
This diff is collapsed.
Click to expand it.
circle/dashboard/views/util.py
0 → 100644
This diff is collapsed.
Click to expand it.
circle/dashboard/views/vm.py
0 → 100644
This diff is collapsed.
Click to expand it.
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.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment