Merge branch 'master' into fix-graphs
Conflicts: circle/dashboard/views.py
Showing
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/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
Please
register
or
sign in
to comment