Timo Volkmann 304b52f3a1 Merge remote-tracking branch 'origin/develop' into feature/oidc-v2 ... # Conflicts: # frontend/src/component/navigation.vue # frontend/src/css/navigation.css		2021-10-11 14:52:31 +02:00
..
examples
locales
profiles
static
templates