projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
5d49850
e901b60
)
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
author
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:32 +0000
(17:58 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:32 +0000
(17:58 +0100)
Trivial merge