Commit 800a6d8a authored by Peter Langenkamp's avatar Peter Langenkamp

Merge branch 'master' into 'TEv1-glossary-enhancements'

# Conflicts:
#   docs/terms/guardianship.md
#   docs/terms/legal-system.md
#   plugins/terminology-parser/index.js
parents 5c47890b 8d1c3b3d
Pipeline #17246 passed with stage
in 1 minute and 31 seconds