Update to master
Merge remote-tracking branch 'origin/master' into feature-node-traits Conflicts: circle/dashboard/forms.py circle/dashboard/urls.py circle/dashboard/views.py
Showing
circle/dashboard/fixtures/node.json
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
circle/dashboard/tests/test_models.py
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
circle/firewall/tests.py
deleted
100644 → 0
circle/firewall/tests/__init__.py
0 → 100644
circle/firewall/tests/test_firewall.py
0 → 100644
This diff is collapsed.
Click to expand it.
circle/storage/tasks/periodic_tasks.py
0 → 100644
circle/storage/tests.py
deleted
100644 → 0
circle/storage/tests/__init__.py
0 → 100644
circle/storage/tests/test_models.py
0 → 100644
circle/templates/registration/base.html
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
miscellaneous/portal.conf
0 → 100644
Please
register
or
sign in
to comment