Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment