Merge branch 'feature/holidays' into dev
# Conflicts: # .idea/dataSources.local.xml # schoolapps/static/common/style.css # schoolapps/timetable/templates/timetable/plan.html # schoolapps/timetable/views.py # schoolapps/untisconnect/plan.py
No related branches found
No related tags found
Showing
- biscuit/apps/chronos/templates/timetable/lesson.html 10 additions, 3 deletionsbiscuit/apps/chronos/templates/timetable/lesson.html
- biscuit/apps/chronos/templates/timetable/myplan.html 3 additions, 0 deletionsbiscuit/apps/chronos/templates/timetable/myplan.html
- biscuit/apps/chronos/templates/timetable/plan.html 20 additions, 14 deletionsbiscuit/apps/chronos/templates/timetable/plan.html
- biscuit/apps/chronos/views.py 10 additions, 4 deletionsbiscuit/apps/chronos/views.py
Loading
Please register or sign in to comment