Skip to content
Snippets Groups Projects
Hangzhi Yu's avatar
Hangzhi Yu authored
Merge branch '73-add-rules-and-permissions' into '79-filter-selects-on-week-overview-and-register-absence'

# Conflicts:
#   aleksis/apps/alsijil/forms.py
f3864ef9
History
Name Last commit Last update
..