Skip to content
Snippets Groups Projects
Commit b016ee80 authored by Julian's avatar Julian
Browse files

Merge remote-tracking branch 'origin/fix/design' into fix/design 

# Conflicts:
#	aleksis/apps/alsijil/templates/alsijil/week_view.html
parents fb8d2604 332acf86
No related branches found
No related tags found
1 merge request!48Review use of Materialize
Pipeline #2718 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