Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 4 Sep 2015 11:43:36 +0000 (13:43 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 4 Sep 2015 11:43:36 +0000 (13:43 +0200)
commit4de7462140ced3df0926e40bf29960802482d111
tree113fe0ed96fa02c536963670b3587336726a436d
parent0d2aa0a97caa78428d8437b4959c0f9b50b793b7
parent3f14bc1e27049b60b624d99adfe0da8db5d4fd47
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab

Conflicts:
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
build.gradle
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java