Skip to content
Snippets Groups Projects
Julian Leucker's avatar
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
90b246c4
History
Name Last commit Last update
biscuit/apps/untis