Merge branch 'master' of https://github.com/nextcloud/desktop
authorMichael Schuster <michael@schuster.ms>
Wed, 11 Sep 2019 15:27:49 +0000 (17:27 +0200)
committerMichael Schuster <michael@schuster.ms>
Wed, 11 Sep 2019 15:27:49 +0000 (17:27 +0200)
commitc3d8657619e2374092eaa38e577f7681e6a8adc4
tree7a93f1b65a9905cf2aa9be9183dd04cec5374c0f
parent0557d53f5feabb2c6ec3166feb4e715bcbd2043c
parent51ff031de58ce01361172584d505cd626a0f59c7
Merge branch 'master' of https://github.com/nextcloud/desktop