urls.py
9.64 KB
-
Merge branch 'master' into feature-new-tour · 96fe17ce
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/urls.py
Kálmán Viktor committed
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/urls.py