Skip to content
Commit 4845ef5a authored by Jan-Christoph Borchardt's avatar Jan-Christoph Borchardt
Browse files

Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview

parents 14003b6d f9b28157
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment