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
No related branches found
No related tags found
Showing
- biscuit/apps/chronos/migrations/0010_auto_20190825_1238.py 17 additions, 0 deletionsbiscuit/apps/chronos/migrations/0010_auto_20190825_1238.py
- biscuit/apps/chronos/migrations/0011_merge_20191113_1655.py 13 additions, 0 deletionsbiscuit/apps/chronos/migrations/0011_merge_20191113_1655.py
- biscuit/apps/chronos/pdf.py 1 addition, 1 deletionbiscuit/apps/chronos/pdf.py
- biscuit/apps/chronos/urls.py 2 additions, 1 deletionbiscuit/apps/chronos/urls.py
- biscuit/apps/chronos/views.py 64 additions, 1 deletionbiscuit/apps/chronos/views.py
Loading
Please register or sign in to comment