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)
commit32c114bd17985d7d11900e7702a82a5a72c30e9c
tree59081ed92cf58b3245ba74e8714853861139a575
parentc3d8657619e2374092eaa38e577f7681e6a8adc4
parentd6fce4916248841bf21d9eb5adade6aa5e6368ee
Merge branch 'master' of https://github.com/nextcloud/desktop