Merge branch 'master' of https://github.com/nextcloud/desktop
authorMichael Schuster <michael@schuster.ms>
Fri, 13 Sep 2019 00:19:22 +0000 (02:19 +0200)
committerMichael Schuster <michael@schuster.ms>
Fri, 13 Sep 2019 00:19:22 +0000 (02:19 +0200)

Trivial merge