projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a4296a 2b79f32)
Merge branch 'master' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 11:01:40 +0000 (13:01 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 11:01:40 +0000 (13:01 +0200)
1  2 
res/values-de-rDE/strings.xml patch | diff1 | diff2 | blob | history
res/values-de/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values-de-rDE/strings.xml
Simple merge
diff --cc res/values-de/strings.xml
Simple merge
ownCloud Android App