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

Merge branch 'feature/performance-cache-timetable' into merge/dashboard-cache

# Conflicts:
#	requirements.txt
#	schoolapps/dashboard/urls.py
#	schoolapps/dashboard/views.py
#	schoolapps/helper.py
#	schoolapps/timetable/views.py
#	schoolapps/untisconnect/parse.py
#	schoolapps/untisconnect/plan.py
parents 346638e3 7bfad9cf
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment