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

Merge branch 'dev' into dev-1.1

# Conflicts:
#	schoolapps/templates/partials/footer.html
parents a5c7224a aa9e55aa
No related branches found
No related tags found
Loading
Showing
with 16117 additions and 15974 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 to comment