projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
75b88e1
69833ca
)
Merge remote-tracking branch 'remotes/upstream/target_marshmallow' into beta
author
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 13 Nov 2015 16:45:04 +0000
(17:45 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 13 Nov 2015 16:45:04 +0000
(17:45 +0100)
Trivial merge