| commit | f3826e19174a8477bdf023a36a7726a9a970abe1 | [log] [tgz] |
|---|---|---|
| author | Simon Reis <simon.reis@pta.de> | Fri Jul 03 18:04:24 2020 +0200 |
| committer | Simon Reis <simon.reis@pta.de> | Fri Jul 03 18:04:24 2020 +0200 |
| tree | 7fc575f5ad53e8d62bd521a4fb712ffdcbc24ecf | |
| parent | 97f1310432e9a53dd86470f67d704c17300bbd0a [diff] | |
| parent | 56c53ca846649dcd66968c90be188cbd33590897 [diff] |
Merge branch 'master' into develop # Conflicts: # src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc