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)
Update to oC master


Trivial merge