Merge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android...
authorjabarros <jabarros@solidgear.es>
Fri, 24 Oct 2014 11:38:03 +0000 (13:38 +0200)
committerjabarros <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