urls.py
5.17 KB
-
Merge branch 'feature-base_template' · 3b66d6d6
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/urls.py
Guba Sándor committed
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/urls.py