models.py
6.5 KB
-
Merge branch 'feature-group-details-rebased' · 450f75cfConflicts: circle/dashboard/static/dashboard/group-details.js circle/dashboard/templates/dashboard/index-groups.html circle/dashboard/templates/dashboard/index.html circle/dashboard/urls.py circle/dashboard/views.py
Bach Dániel committed