Skip to content
Snippets Groups Projects
Commit 1902365f authored by Andreas Valder's avatar Andreas Valder
Browse files

Merge branch 'master' into '289-hilfreichere-darstellung-von-statistiken' 

# Conflicts:
#   templates/lecture.html
parents 93f6c09e 7352503e
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment