Skip to content
Commit 410c6bba authored by Jan-Christoph Borchardt's avatar Jan-Christoph Borchardt
Browse files

Merge branch 'master' of gitorious.org:owncloud/owncloud

parents 8d203531 f073041b
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