Merge pull request #1068 from owncloud/conflictDialog_newWording
authormasensio <masensio@solidgear.es>
Wed, 5 Aug 2015 10:53:03 +0000 (12:53 +0200)
committermasensio <masensio@solidgear.es>
Wed, 5 Aug 2015 10:53:03 +0000 (12:53 +0200)
commit9a0361945c3028490381d86b32d7be21662005f4
tree317eed22f831530d94b4f5a6f70853eb101a58a1
parent6698b2d5f109df7db935ff5e962a631167391076
parent156cb5e81b63ca1d3d79ba446a32470aa5e2e78b
Merge pull request #1068 from owncloud/conflictDialog_newWording

Conflict dialog: new wording