From bfe9127dbe9e33453e379d7466d4b0650663a9fb Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 29 Oct 2015 18:25:53 +0100 Subject: [PATCH] Merge remote-tracking branch 'remotes/upstream/material_fab' into beta # Conflicts: # src/com/owncloud/android/ui/activity/FileDisplayActivity.java --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d56c9f92..6251604c 100644 --- 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 +- PR [#1209](https://github.com/owncloud/android/pull/1209) "Material buttons - before in #1090" merged # 2015-10-26 -- 2.11.0