Merge branch 'master' of https://github.com/nextcloud/desktop
authorMichael Schuster <michael@schuster.ms>
Wed, 25 Sep 2019 23:41:06 +0000 (01:41 +0200)
committerMichael Schuster <michael@schuster.ms>
Wed, 25 Sep 2019 23:41:06 +0000 (01:41 +0200)

Trivial merge