Merge branch 'material_buttons' of https://github.com/owncloud/android into beta
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 13:17:31 +0000 (14:17 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 13:17:31 +0000 (14:17 +0100)
commit37d67265bd60a76f350a9941d8f59cdd82d38603
tree6e58d378a00a3e2c377ba021a246bfeacf178290
parent12dbd25ac9691faebd909322e9fa4662fa5cc1f8
parent8110be015585c05fdd675233a5defca8d014298f
Merge branch 'material_buttons' of https://github.com/owncloud/android into beta

Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
res/layout/list_item.xml
res/values-cs-rCZ/strings.xml
res/values-fi-rFI/strings.xml
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-nl/strings.xml
res/values-pt-rBR/strings.xml
res/values-pt-rPT/strings.xml
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java