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