Merge branch 'master' of https://github.com/owncloud/client
authorRoeland Jago Douma <roeland@famdouma.nl>
Wed, 18 Oct 2017 19:03:15 +0000 (21:03 +0200)
committerRoeland Jago Douma <roeland@famdouma.nl>
Wed, 18 Oct 2017 19:03:15 +0000 (21:03 +0200)
commitbc7e65b39552ac458b2adacf76cbf98735ec29a0
treec85515363e951eb2cbf1c3a42d0ab62855ce1a29
parent9eabd2a32a2c0e75ecfbed565b5b3dc8e0afce0f
parent7f51803d04fb8411b425207763a584406ee04178
Merge branch 'master' of https://github.com/owncloud/client