Skip to content
Snippets Groups Projects
Commit 9cff3804 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

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

# Conflicts:
#	aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
#	aleksis/apps/alsijil/views.py
parents 0292d973 579f7532
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment