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

Merge branch 'dev'

# Conflicts:
#	schoolapps/templates/partials/footer.html
parents 890bb995 41638e48
No related branches found
No related tags found
1 merge request!86Merge school-apps
Showing
with 16113 additions and 15971 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