core/views/common_views.py · 5e091c55c09177d58877243693d8089092c6f4b7 · Jan Maximilian Michal / grady

3 years ago

Merge branch 'master' into '272-reviewers-should-be-able-to-assign-exercise-groups-to-tutors' · 925b18e2

Jakob Dieterle authored 3 years ago

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

925b18e2

History

Merge branch 'master' into '272-reviewers-should-be-able-to-assign-exercise-groups-to-tutors'

Jakob Dieterle authored 3 years ago

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