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)
commitcb60e8aa90436297990dba5aade363daca55bd1e
treede0185dc6ff149dad7b7d759139e4d32551b85ab
parent44ed5744f10686d2e9c436bace0bfc3f43c04478
parent8ebacae8468274dc8cd026892af9f27afdfdcd17
Merge branch 'master' of https://github.com/nextcloud/desktop