Merge branch 'develop' into thumbnails_from_server
authorjabarros <jabarros@solidgear.es>
Mon, 27 Oct 2014 14:12:48 +0000 (15:12 +0100)
committerjabarros <jabarros@solidgear.es>
Mon, 27 Oct 2014 14:12:48 +0000 (15:12 +0100)
commitdcb985481be4b3c4e4e805b4aefebae00f9ad3e9
tree6803286356493efe41a59398f8cfd72c90333e93
parent13fab9321e6f06623b55551e03e5b5a9e677fb46
parent495c812671a93a77c31779b157ee31920acfce85
Merge branch 'develop' into thumbnails_from_server

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