Merge pull request #32 from nextcloud-gmbh/oc_master
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Wed, 28 Jun 2017 11:24:24 +0000 (13:24 +0200)
committerGitHub <noreply@github.com>
Wed, 28 Jun 2017 11:24:24 +0000 (13:24 +0200)
commit501394ec6f94407b19718793e062ac8aef081dcb
treecc2453d3bf3cc7f4b0ab34ffe8f64da3c3e1b5b2
parentf88431adbf57ddd7af3952bcea3f993467fb3032
parent59bbbd5e66e41415e79a31079d130bbc5ae296b3
Merge pull request #32 from nextcloud-gmbh/oc_master

Oc master