Skip to content
Commit d2f3710e authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview 

Get a 96x96 preview for file conflict resolution
parents cf2c5992 f05ac47e
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