# Conflicts:
#   core/serializers/tutor.py
#   core/views/common_views.py
#   frontend/src/components/tutor_list/TutorList.vue
#   frontend/src/models.ts

Merge branch '272-reviewers-should-be-able-to-assign-exercise-groups-to-tutors' of gitlab.gwdg.de:j.michal/grady into 272-reviewers-should-be-able-to-assign-exercise-groups-to-tutors

Thilo Wischmeyer authored 3 years ago and Thilo Wischmeyer committed 3 years ago

unlock dark mode.

Thilo Wischmeyer authored 3 years ago and Thilo Wischmeyer committed 3 years ago

It was always larger than the parent. Now it fits.

Merge branch '272-reviewers-should-be-able-to-assign-exercise-groups-to-tutors' of gitlab.gwdg.de:j.michal/grady into 272-reviewers-should-be-able-to-assign-exercise-groups-to-tutors