Skip to content
Snippets Groups Projects
Select Git revision
0 results
Blame Permalink
  • Julian's avatar
    4b9f58a5
    Merge branch 'master' into 266-add-statistics-page-for-absences · 4b9f58a5
    Julian authored 
    # 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
    4b9f58a5
    History
    Merge branch 'master' into 266-add-statistics-page-for-absences
    Julian authored 
    # 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