resolve merge conflict: update of the docu

This commit is contained in:
2020-06-17 20:22:42 +02:00
parent 2c0f16a317
commit 4d04f45699
20 changed files with 247 additions and 197 deletions

File diff suppressed because one or more lines are too long