Commit f3864ef9 authored 4 years ago by Hangzhi Yu

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

Merge branch '73-add-rules-and-permissions' into '79-filter-selects-on-week-overview-and-register-absence'

# Conflicts:
#   aleksis/apps/alsijil/forms.py

parents 017602dd cbd4e140

No related branches found

No related tags found

2 merge requests!72Resolve "Filter selects on week overview and register absence",!49Resolve "Add rules and permissions"

Pipeline #3502 passed 4 years ago