projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
b154fba
)
Merge branch 'develop' into accounts_view
author
jabarros
<jabarros@solidgear.es>
Thu, 7 Aug 2014 15:34:15 +0000
(17:34 +0200)
committer
jabarros
<jabarros@solidgear.es>
Thu, 7 Aug 2014 15:34:15 +0000
(17:34 +0200)
Conflicts:
res/values/strings.xml
No differences found