base.html
2.42 KB
-
Merge branch 'master' into issue-sliders · 7bb23000
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/views.py
Kálmán Viktor committed
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/views.py