Merge branch 'release-1.8' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 24 Sep 2015 07:46:23 +0000 (09:46 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 24 Sep 2015 07:46:23 +0000 (09:46 +0200)
commit97747c9ad3545679a05fff6e0dccad24f2dd2375
tree429893161a86511d919fa94122a26ea6bd2b88ae
parentd3ffaa590b96bd2d0250cf833ea6ebdf4f52d2af
parenta81934a6cc3b769ec937b8407fc11e1aa96d635e
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_fab
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java