Merge pull request #6 from nextcloud/mergeWithOrigin
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Mon, 9 Oct 2017 06:50:13 +0000 (08:50 +0200)
committerGitHub <noreply@github.com>
Mon, 9 Oct 2017 06:50:13 +0000 (08:50 +0200)
Update master from current owncloud master


Trivial merge