Conflict Dialog Fix
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 11:57:09 +0000 (13:57 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 11:57:09 +0000 (13:57 +0200)
commite79f92f566b6df6f602d5777579236ab5f017423
treee6a3e25fa34e774c8946f99a06be297d44c8ae3b
parenta393531774cb8d34e0c11099edef64cc4d0480a0
Conflict Dialog Fix
res/values-de-rDE/strings.xml
res/values/strings.xml
src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java