Skip to content
Commit 41c6caff authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel
Browse files

Merge branch 'master' into 'staging' 

# Conflicts:
#   src/assets/i18n/creator/de.json
#   src/assets/i18n/creator/en.json
#   src/assets/i18n/creator/fr.json
#   src/assets/i18n/participant/de.json
#   src/assets/i18n/participant/fr.json
parents d40f81a3 85707c0a
Pipeline #85336 passed with warnings with stages
in 9 minutes and 26 seconds
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