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)
commit9eabd2a32a2c0e75ecfbed565b5b3dc8e0afce0f
tree7af1320d05fbc2f5aa9654642458996a5603b3f0
parentcba78eb11fb8ebdb46a6a895becc2f5db96ba2d2
parent19c6757a0f971e5ba906ae70f3fce3d8af103e68
Merge pull request #6 from nextcloud/mergeWithOrigin

Update master from current owncloud master