Skip to content
Snippets Groups Projects
Commit eb2dedab authored by Frank Poetzsch-Heffter's avatar Frank Poetzsch-Heffter
Browse files

Merge branch 'dev' into feature/FIBU-initial 

# Conflicts:
#	schoolapps/static/common/style.css
parents 633893f8 c18474c9
No related branches found
No related tags found
1 merge request!86Merge school-apps
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 192 additions and 19858 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment