Skip to content
Snippets Groups Projects
Commit 098a7a1d authored by Julian's avatar Julian
Browse files

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

# Conflicts:
#	aleksis/apps/alsijil/frontend/index.js
#	aleksis/apps/alsijil/model_extensions.py
parents ada3a164 40b86d09
No related branches found
No related tags found
1 merge request!361Resolve "Add statistics page for absences"
Pipeline #193595 failed
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker