Skip to content
Snippets Groups Projects
  • Julian's avatar
    8ed6f540
    Merge branch 'master' into absenzen · 8ed6f540
    Julian authored
    # 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/messages/en.json
    #	aleksis/apps/alsijil/models.py
    #	aleksis/apps/alsijil/schema/__init__.py
    8ed6f540
    History
    Merge branch 'master' into absenzen
    Julian authored
    # 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/messages/en.json
    #	aleksis/apps/alsijil/models.py
    #	aleksis/apps/alsijil/schema/__init__.py