Skip to content
Commit 9a036194 authored by masensio's avatar masensio
Browse files

Merge pull request #1068 from owncloud/conflictDialog_newWording 

Conflict dialog: new wording
parents 6698b2d5 156cb5e8
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