-
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
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