Merge pull request #18 from nextcloud/up_mas
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Wed, 18 Oct 2017 19:13:24 +0000 (21:13 +0200)
committerGitHub <noreply@github.com>
Wed, 18 Oct 2017 19:13:24 +0000 (21:13 +0200)
commitf56e1d167dd8166570e06f3f0c25d2b938a81564
treec85515363e951eb2cbf1c3a42d0ab62855ce1a29
parent9eabd2a32a2c0e75ecfbed565b5b3dc8e0afce0f
parentbc7e65b39552ac458b2adacf76cbf98735ec29a0
Merge pull request #18 from nextcloud/up_mas

Update to oC master