Skip to content
Snippets Groups Projects
Commit 1124843e authored by Julian's avatar Julian
Browse files

Merge branch 'master' into 260-add-personal-note-management-dialog-in-course-book

# Conflicts:
#	aleksis/apps/alsijil/frontend/components/coursebook/Coursebook.vue
#	aleksis/apps/alsijil/frontend/components/coursebook/CoursebookDay.vue
#	aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue
#	aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsTrigger.vue
#	aleksis/apps/alsijil/frontend/components/coursebook/absences/participationStatus.graphql
#	aleksis/apps/alsijil/frontend/components/coursebook/coursebook.graphql
#	aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue
#	aleksis/apps/alsijil/frontend/messages/de.json
#	aleksis/apps/alsijil/models.py
#	aleksis/apps/alsijil/schema/__init__.py
#	aleksis/apps/alsijil/schema/documentation.py
#	aleksis/apps/alsijil/schema/participation_status.py
parents dcf62342 f7b356ca
No related branches found
No related tags found
Loading
Checking pipeline status
Showing
with 1907 additions and 1323 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment