projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1375825
e901b60
)
Merge remote-tracking branch 'upstream/develop' into fileCount
author
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 21 Nov 2014 16:59:51 +0000
(17:59 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 21 Nov 2014 16:59:51 +0000
(17:59 +0100)
1
2
res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/strings.xml
Simple merge