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

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
Stage: test
Stage: build
Hide whitespace changes
Inline Side-by-side
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