projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f973a1d
a544613
)
Merge branch 'develop' into automationTest
author
purigarcia
<pgarcia@solidgear.es>
Fri, 29 May 2015 12:17:52 +0000
(14:17 +0200)
committer
purigarcia
<pgarcia@solidgear.es>
Fri, 29 May 2015 12:17:52 +0000
(14:17 +0200)
1
2
res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/strings.xml
Simple merge