projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
db406ff
e92297c
)
Merge remote-tracking branch 'remotes/upstream/uploadWhenCharging' into beta
author
tobiasKaminsky
<tobias@kaminsky.me>
Mon, 26 Oct 2015 21:15:56 +0000
(22:15 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Mon, 26 Oct 2015 21:15:56 +0000
(22:15 +0100)
Trivial merge