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

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

parents d0e4727e 990ac34a
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