projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26b1864 82fd5e4)
Merge remote-tracking branch 'remotes/upstream/master' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 19:21:40 +0000 (20:21 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 19:21:40 +0000 (20:21 +0100)
1  2 
res/values-ja-rJP/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values-ja-rJP/strings.xml
Simple merge
ownCloud Android App