Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 4 Nov 2015 09:11:27 +0000 (10:11 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 4 Nov 2015 09:11:27 +0000 (10:11 +0100)
commit4d33ecf15e9a4fa22e1e49e563793704c7598a3f
tree73fc44eaa3f9c3362a4a4b2183a6db7fb41c1f5c
parent01115a1cd50362a22924845ddc72c74467ad5d10
parent337b8f30a5125e4708c75c136507315426bc930f
Merge branch 'material_buttons' of https://github.com/owncloud/android into beta

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