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)
commit2e47071c9c44d687b0c69a393807ea32fde08184
tree2f9d8ac8acd6dd822999e8eda72724f7be2d33e5
parent832a98f47c4f399141c2e36af09509853727ba5b
parenteffa6908b0ff55c7aca1d4d74c22735287c8dff1
Merge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android into thumbnails_from_server

Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/MainApp.java
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java