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

Merge branch 'dev' into dev-1.1.1

# Conflicts:
#	schoolapps/static/common/style.css
parents 1425d8f8 d1a02168
Loading
Showing
with 816 additions and 19 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