projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6698b2d 156cb5e)
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)
Conflict dialog: new wording


Trivial merge
ownCloud Android App