Merge branch 'develop' into thumbnailForUpload
authorjabarros <jabarros@solidgear.es>
Mon, 12 Jan 2015 13:30:06 +0000 (14:30 +0100)
committerjabarros <jabarros@solidgear.es>
Mon, 12 Jan 2015 13:30:06 +0000 (14:30 +0100)
commit6c70154a506b0963ed5aa0a402dc80a2933f1087
treef43b2c445295f53ec62456a2f46a4eb951426cf4
parentb7e80e6ace7078f14dfae71b60e76f763b17983d
parent26403abd0a9df7a3b83d49b302d19d223ddc0406
Merge branch 'develop' into thumbnailForUpload
src/com/owncloud/android/ui/adapter/FileListListAdapter.java