projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
126d251
0cb5cee
)
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles
author
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 25 Sep 2015 15:23:31 +0000
(17:23 +0200)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 25 Sep 2015 15:23:31 +0000
(17:23 +0200)
Trivial merge