Skip to content
Commit 7dc72a48 authored by Björn Schießle's avatar Björn Schießle
Browse files

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

parents 9cb01bd0 b9ce4e1f
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