Skip to content
Commit d8b7e42f authored by Victor Dubiniuk's avatar Victor Dubiniuk
Browse files

Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes 

File conflicts dialog fixes
parents b48dffa9 4ccbace6
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