Skip to content
Commit 1041617a authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge pull request #8260 from owncloud/stable6-backport-8183-and-co 

Backport of #8183 and #8197
parents a3145085 9b36224b
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