Merge remote-tracking branch 'remotes/upstream/material_fab' into beta

# Conflicts:
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d56c9f9..6251604 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 2015-10-29
 - PR [#1099](https://github.com/owncloud/android/pull/1099) "Switch list vs grid" merged
 - PR [#1100](https://github.com/owncloud/android/pull/1100) "Material FAB with speed dial implementation" merged
 # 2015-10-29
 - PR [#1099](https://github.com/owncloud/android/pull/1099) "Switch list vs grid" merged
 - PR [#1100](https://github.com/owncloud/android/pull/1100) "Material FAB with speed dial implementation" merged

+- PR [#1209](https://github.com/owncloud/android/pull/1209) "Material buttons - before in #1090" merged

 
 
 # 2015-10-26
 
 
 # 2015-10-26