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