Skip to content
Snippets Groups Projects
Commit 4b9f58a5 authored by Julian's avatar Julian
Browse files

Merge branch 'master' into 266-add-statistics-page-for-absences

# Conflicts:
#	aleksis/apps/alsijil/frontend/components/coursebook/absences/AbsenceCreationDialog.vue
#	aleksis/apps/alsijil/frontend/components/coursebook/absences/AbsenceCreationForm.vue
#	aleksis/apps/alsijil/frontend/components/coursebook/absences/AbsenceCreationSummary.vue
#	aleksis/apps/alsijil/frontend/components/coursebook/absences/absenceCreation.graphql
#	aleksis/apps/alsijil/frontend/index.js
#	aleksis/apps/alsijil/frontend/messages/de.json
#	aleksis/apps/alsijil/frontend/messages/en.json
#	aleksis/apps/alsijil/schema/__init__.py
#	aleksis/apps/alsijil/schema/absences.py
#	aleksis/apps/alsijil/schema/personal_note.py
parents 0c644d54 8a757f6a
No related branches found
No related tags found
1 merge request!361Resolve "Add statistics page for absences"
Pipeline #192678 failed
Showing
with 1414 additions and 463 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