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)
commitdf010957a38f58ba1065e137d1eaf5053e38779a
tree37f25fe644e86b7584e5ff4a3a0593c2d8695cf0
parent8ec87fb1ae3802112e77b3fbaf6c0075dc98863c
parentc2a2963d07ff9994ba03b4fe7b14b81e376223d9
Merge branch 'setup-deploy' into development