projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
7edbe05
)
Merge remote-tracking branch 'origin/master'
author
David A. Velasco
<dvelasco@solidgear.es>
Mon, 8 Oct 2012 07:10:37 +0000
(09:10 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Mon, 8 Oct 2012 07:10:37 +0000
(09:10 +0200)
Conflicts:
res/values-ca/strings.xml
res/values-el/strings.xml
No differences found