Skip to content
Snippets Groups Projects
  • Julian's avatar
    4ade9549
    Merge branch 'feature/holidays' into dev · 4ade9549
    Julian authored
    # Conflicts:
    #	.idea/dataSources.local.xml
    #	schoolapps/static/common/style.css
    #	schoolapps/timetable/templates/timetable/plan.html
    #	schoolapps/timetable/views.py
    #	schoolapps/untisconnect/plan.py
    4ade9549
    History
    Merge branch 'feature/holidays' into dev
    Julian authored
    # Conflicts:
    #	.idea/dataSources.local.xml
    #	schoolapps/static/common/style.css
    #	schoolapps/timetable/templates/timetable/plan.html
    #	schoolapps/timetable/views.py
    #	schoolapps/untisconnect/plan.py