• Rieks Joosten's avatar
    Merge branch 'terminology-rieks' of... · b56eec81
    Rieks Joosten authored
    Merge branch 'terminology-rieks' of https://gitlab.grnet.gr/essif-lab/framework into terminology-rieks
    
    # Conflicts:
    #	docs/notations-and-conventions.md
    #	docs/terms/action.md
    #	docs/terms/actor.md
    #	docs/terms/agent.md
    #	docs/terms/colleague.md
    #	docs/terms/concept-file.md
    #	docs/terms/corpus.md
    #	docs/terms/credential.md
    #	docs/terms/definition.md
    #	docs/terms/dictionary-file.md
    #	docs/terms/dictionary.md
    #	docs/terms/digital-actor.md
    #	docs/terms/digital-agent.md
    #	docs/terms/digital-colleague.md
    #	docs/terms/digital-policy.md
    #	docs/terms/employee.md
    #	docs/terms/employer.md
    #	docs/terms/glossary-file.md
    #	docs/terms/glossary.md
    #	docs/terms/holder-policy.md
    #	docs/terms/holder.md
    #	docs/terms/issuer-policy.md
    #	docs/terms/issuer.md
    #	docs/terms/jurisdiction.md
    #	docs/terms/knowledge.md
    #	docs/terms/legal-entity.md
    #	docs/terms/legal-jurisdiction.md
    #	docs/terms/mental-model.md
    #	docs/terms/organization.md
    #	docs/terms/owner.md
    #	docs/terms/party.md
    #	docs/terms/pattern-file.md
    #	docs/terms/pattern-party-actor-action.md
    #	docs/terms/pattern.md
    #	docs/terms/peer-agent.md
    #	docs/terms/peer-party.md
    #	docs/terms/policy-governor.md
    #	docs/terms/policy.md
    #	docs/terms/presentation-request.md
    #	docs/terms/principal.md
    #	docs/terms/risk.md
    #	docs/terms/scope-file.md
    #	docs/terms/scope.md
    #	docs/terms/semantics.md
    #	docs/terms/ssi-agent.md
    #	docs/terms/term-file.md
    #	docs/terms/term.md
    #	docs/terms/terminology.md
    #	docs/terms/transaction-result-dispatcher.md
    #	docs/terms/trd-policy.md
    #	docs/terms/tve-policy.md
    #	docs/terms/validated-data.md
    #	docs/terms/verifiable-credential.md
    #	docs/terms/verified-data.md
    #	docs/terms/verifier-policy.md
    #	docs/terms/verifier.md
    #	docs/terms/wallet-policy.md
    #	docs/terms/wallet.md
    #	static/images/patterns/pattern-party-actor-action.png
    b56eec81
notations-and-conventions.md 3.82 KB