Skip to content
  • Rieks Joosten's avatar
    Merge branch 'master' into terminology-rieks · d6540f5e
    Rieks Joosten authored
    # Conflicts:
    #	docs/functional-architecture.md
    #	docs/terminology-maintenance-script.rieks
    #	docs/terms/action-type.md
    #	docs/terms/action.md
    #	docs/terms/agent.md
    #	docs/terms/author.md
    #	docs/terms/business-transaction.md
    #	docs/terms/colleague.md
    #	docs/terms/commitment-decision.md
    #	docs/terms/communication-session.md
    #	docs/terms/concept-file.md
    #	docs/terms/credential-catalogue.md
    #	docs/terms/credential-type.md
    #	docs/terms/data-collector.md
    #	docs/terms/data-discloser.md
    #	docs/terms/definition.md
    #	docs/terms/dependent.md
    #	docs/terms/dictionary-file.md
    #	docs/terms/digital-policy.md
    #	docs/terms/employer.md
    #	docs/terms/glossary-file.md
    #	docs/terms/governor.md
    #	docs/terms/guardian.md
    #	docs/terms/guardianship.md
    #	docs/terms/holder.md
    #	docs/terms/identifier.md
    #	docs/terms/issuer.md
    #	docs/terms/jurisdiction.md
    #	docs/terms/legal-entity.md
    #	docs/terms/legal-system.md
    #	docs/terms/owned.md
    #	docs/terms/party.md
    #	docs/terms/pattern-file.md
    #	docs/terms/pattern-guardianship.md
    #	docs/terms/pattern.md
    #	docs/terms/presentation.md
    #	docs/terms/principal.md
    #	docs/terms/scope-file.md
    #	docs/terms/term-file.md
    #	docs/terms/transaction-data-collector.md
    #	docs/terms/transaction-id.md
    #	docs/terms/transaction-request.md
    #	docs/terms/transaction-type.md
    #	docs/terms/verifier.md
    d6540f5e