Skip to content
Snippets Groups Projects
Commit ac3081d7 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'dev-1.1' into feature/performance-cache-timetable 

# Conflicts:
#	schoolapps/dashboard/views.py
#	schoolapps/timetable/views.py
#	schoolapps/untisconnect/api.py
#	schoolapps/untisconnect/plan.py
parents 9c271816 21339a4f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment