projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f1113a6
a48db2f
)
Merge remote-tracking branch 'remotes/upstream/videoBigThumbnails' into beta
author
tobiasKaminsky
<tobias@kaminsky.me>
Thu, 29 Oct 2015 17:38:07 +0000
(18:38 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Thu, 29 Oct 2015 17:38:07 +0000
(18:38 +0100)
1
2
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Simple merge