vm.py
51.5 KB
-
Merge branch 'master' into feature-new-tour · df7e52cf
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