Skip to content
Commit 16e24dc4 authored by Frank Karlitschek's avatar Frank Karlitschek
Browse files

Merge branch 'stable6' of https://github.com/owncloud/core into stable6

parents dc11b87a c8d34eaf
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