Skip to content
Commit 8e42b02a authored by Georg Ehrke's avatar Georg Ehrke
Browse files

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

parents 8c405a59 c6f78fbe
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