Skip to content
Snippets Groups Projects
Commit a1d03de6 authored by Michiel de Jong's avatar Michiel de Jong
Browse files

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

parents 3f87c2ce 8fe52510
Loading
Showing
with 152 additions and 145 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment