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

Merge branch 'master' into 73-add-rules-and-permissions 

# Conflicts:
#	aleksis/apps/alsijil/menus.py
#	aleksis/apps/alsijil/models.py
#	aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
#	aleksis/apps/alsijil/views.py
parents 63c96016 0b8aa003
No related branches found
No related tags found
1 merge request!49Resolve "Add rules and permissions"
Hide whitespace changes
Inline Side-by-side
Showing
with 381 additions and 334 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