Merge branch 'master' of https://github.com/nextcloud/desktop
authorMichael Schuster <michael@schuster.ms>
Sat, 7 Sep 2019 01:30:47 +0000 (03:30 +0200)
committerMichael Schuster <michael@schuster.ms>
Sat, 7 Sep 2019 01:30:47 +0000 (03:30 +0200)
commit0557d53f5feabb2c6ec3166feb4e715bcbd2043c
treef2156419679bf9e69beed557cad760a490d7a003
parent4cb45d5d6ad8c499273a7e55b9c8307dcdaece83
parent819a006a170243232f09182fd31bc6e7c3aa9bc4
Merge branch 'master' of https://github.com/nextcloud/desktop