projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
8587f64
8cf7a1c
)
Merge branch 'develop' into share_link_show_shared_files
author
masensio
<masensio@solidgear.es>
Mon, 20 Jan 2014 10:36:10 +0000
(11:36 +0100)
committer
masensio
<masensio@solidgear.es>
Mon, 20 Jan 2014 10:36:10 +0000
(11:36 +0100)
Trivial merge