tree 7fc575f5ad53e8d62bd521a4fb712ffdcbc24ecf
parent 97f1310432e9a53dd86470f67d704c17300bbd0a
parent 56c53ca846649dcd66968c90be188cbd33590897
author Simon Reis <simon.reis@pta.de> 1593792264 +0200
committer Simon Reis <simon.reis@pta.de> 1593792264 +0200

Merge branch 'master' into develop

# Conflicts:
#	src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc