Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-Core
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

dd7bbff8

Commit dd7bbff8 authored 5 years ago by Frank Poetzsch-Heffter

Downloads
- Plain Diff

Merge branch 'dev-1.1' into feature/several-days-in-one-tex-document-#288

parents 1eed6b1c 3a3745ce

No related branches found

No related tags found

1 merge request!86Merge school-apps

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

schoolapps/schoolapps/settings.py 1 addition, 1 deletion

schoolapps/schoolapps/settings.py
schoolapps/timetable/pdf.py 1 addition, 1 deletion

schoolapps/timetable/pdf.py
schoolapps/timetable/views.py 56 additions, 1 deletion

schoolapps/timetable/views.py
schoolapps/untisconnect/api.py 45 additions, 2 deletions

schoolapps/untisconnect/api.py

with 103 additions and 5 deletions

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 sign in to comment