Skip to content
Commit 323a98ad authored by Georg Ehrke's avatar Georg Ehrke
Browse files

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

parents ea8461e8 c383543e
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