Merge remote-tracking branch 'origin/fix/design' into fix/design
# Conflicts: # aleksis/apps/alsijil/templates/alsijil/week_view.html
No related branches found
No related tags found
Checking pipeline status
# Conflicts: # aleksis/apps/alsijil/templates/alsijil/week_view.html