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

Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs 

fix thumbnail generation for subdirectories in the conflicts dialog
parents aa0bcf7b d9e333c0
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