Skip to content
Unverified Commit 42c66efe authored by Arthur Schiwon's avatar Arthur Schiwon
Browse files

Merge branch 'master' of https://github.com/owncloud/core into downstream-160611

parents 75f37f55 52a0c939
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