Commit 4db81012 authored by Rieks Joosten's avatar Rieks Joosten

Merge remote-tracking branch 'origin/master' into terminology-rieks

# Conflicts:
#	docs/functional-architecture.md
#	docs/terminology-plugin-instructions.md
#	docs/terms/assertion.md
#	docs/terms/business-transaction.md
#	docs/terms/credential.md
#	docs/terms/pattern-jurisdiction.md
#	docs/terms/pattern-party-actor-action.md
#	plugins/terminology-parser/index.js
parents 8bd7d725 617cbb66
Pipeline #16868 passed with stage
in 2 minutes and 42 seconds
Markdown is supported
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