projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dcd8dde
8882fb2
)
Merge branch 'develop' into pinEnhancement
author
masensio
<masensio@solidgear.es>
Tue, 5 May 2015 11:56:57 +0000
(13:56 +0200)
committer
masensio
<masensio@solidgear.es>
Tue, 5 May 2015 11:56:57 +0000
(13:56 +0200)
1
2
res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/strings.xml
Simple merge