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)
commitcacba220f92038d3f0e5e88229bb9161a56826ee
tree43cd96bdb40f6e9c75bc232b5e9ff8d9b32fb546
parent63d99f3e3074cca62dd799b8763916480906e690
parentcdc5c1db43e9eebfde1b5f8428ad4d4ece988f3d
Merge pull request #48 from nextcloud-gmbh/master-oc

Bump to oc master