Merge branch 'master' of https://github.com/nextcloud/desktop
authorMichael Schuster <michael@schuster.ms>
Tue, 17 Sep 2019 15:46:17 +0000 (17:46 +0200)
committerMichael Schuster <michael@schuster.ms>
Tue, 17 Sep 2019 15:46:17 +0000 (17:46 +0200)

Trivial merge