Skip to content
Commit 55194e03 authored by Frank Karlitschek's avatar Frank Karlitschek
Browse files

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

parents 97a8af7f 5611e6c9
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