projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af2841e 8331456)
Merge remote-tracking branch 'remotes/upstream/master' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:49:03 +0000 (17:49 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:49:03 +0000 (17:49 +0100)
1  2 
res/values-pt-rBR/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values-pt-rBR/strings.xml
Simple merge
ownCloud Android App