Merge branch 'setup-deploy' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Sat, 19 Sep 2020 21:14:49 +0000 (23:14 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Sat, 19 Sep 2020 21:14:49 +0000 (23:14 +0200)

Trivial merge