Skip to content
GitLab
Explore
Sign in
Commit
d2f3710e
authored
Jun 02, 2015
by
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment