Merge branch 'feature-django-1.7'
Conflicts: circle/dashboard/forms.py
Showing
This diff is collapsed.
Click to expand it.
circle/acl/south_migrations/0001_initial.py
0 → 100644
circle/acl/south_migrations/__init__.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.
circle/firewall/south_migrations/__init__.py
0 → 100644