Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:09:14 +0000 (18:09 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:09:14 +0000 (18:09 +0100)
commit563e6cbdad4dc183f95e18fb254e4a97efbb9a26
treedd7712dbc30ddc186a7784cc23cb84ffdc3b082b
parented763a67d304e2d90c39bbdf5b323ba10b997c2c
parent477c7a6b0a7c6b8300db4e3bedd890eaba718124
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
build.gradle
res/menu/main_menu.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/utils/DisplayUtils.java