projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
45fd60d
b2af9ef
)
Merge remote-tracking branch 'upstream/develop' into us4_view_text_files
author
Jorge Antonio Diaz-Benito Soriano
<jorge.diazbenitosoriano@gmail.com>
Sat, 29 Nov 2014 20:12:51 +0000
(21:12 +0100)
committer
Jorge Antonio Diaz-Benito Soriano
<jorge.diazbenitosoriano@gmail.com>
Sat, 29 Nov 2014 20:12:51 +0000
(21:12 +0100)
Trivial merge