Merge branch 'master' into feature-template-wizard
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/urls.py
Showing
circle/common/operations.py
0 → 100644
circle/common/tests/test_operations.py
0 → 100644
circle/dashboard/tests/test_mockedviews.py
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/firewall/iptables.py
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.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
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/vm/operations.py
0 → 100644
This diff is collapsed.
Click to expand it.
circle/vm/tests/test_operations.py
0 → 100644
Please
register
or
sign in
to comment