Merge pull request #48 from nextcloud-gmbh/master-oc
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Fri, 25 Aug 2017 13:06:26 +0000 (15:06 +0200)
committerGitHub <noreply@github.com>
Fri, 25 Aug 2017 13:06:26 +0000 (15:06 +0200)
Bump to oc master


Trivial merge