projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
2e47071
)
Merge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android...
author
jabarros
<jabarros@solidgear.es>
Fri, 24 Oct 2014 11:38:03 +0000
(13:38 +0200)
committer
jabarros
<jabarros@solidgear.es>
Fri, 24 Oct 2014 11:38:03 +0000
(13:38 +0200)
Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
No differences found