Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 21:23:36 +0000 (23:23 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 21:23:36 +0000 (23:23 +0200)
commit99e6db3d34f7f7498cc0d5bcc49fb3b7487511c1
tree8cc7b905d9d5c4b12a7b0897d593ebfa8e2981be
parentb0cb99b7c8081670af3c0e7f7a59f3cf0aa9c7d7
parent7f13b98cc06723b129c7fff05fed188612a9f100
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
res/values/colors.xml
res/values/styles.xml
src/com/owncloud/android/ui/fragment/OCFileListFragment.java