Skip to content
Commit fe6e4714 authored by Jakob Moser's avatar Jakob Moser
Browse files

Merge branch 'master' into '12-link-agenda-in-navbar' 

# Conflicts:
#   portal/static/js/components/pieces/Nav.mjs
parents dfc0be13 2ea1dfdb
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