From: masensio <masensio@solidgear.es>
Date: Wed, 5 Aug 2015 10:53:03 +0000 (+0200)
Subject: Merge pull request #1068 from owncloud/conflictDialog_newWording
X-Git-Tag: oc-android-1.8~48
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9a0361945c3028490381d86b32d7be21662005f4?hp=156cb5e81b63ca1d3d79ba446a32470aa5e2e78b

Merge pull request #1068 from owncloud/conflictDialog_newWording

Conflict dialog: new wording
---