models.py
6.48 KB
-
Merge branch 'feature-group-details-fixed' · 3cf09597
Conflicts: circle/dashboard/static/dashboard/dashboard.js circle/dashboard/urls.py
Bach Dániel committed
Conflicts: circle/dashboard/static/dashboard/dashboard.js circle/dashboard/urls.py