Skip to content
Snippets Groups Projects
Commit 8738d10a 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 a0667674 6c5ea78d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 142 additions and 46 deletions
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