From ed763a67d304e2d90c39bbdf5b323ba10b997c2c Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 29 Oct 2015 18:02:00 +0100 Subject: [PATCH] Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster # Conflicts: # res/menu/file_actions_menu.xml # src/com/owncloud/android/ui/fragment/OCFileListFragment.java # src/com/owncloud/android/utils/DisplayUtils.java --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6436dc01..10d22447 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2015-10-29 +- PR [#1099](https://github.com/owncloud/android/pull/1099) "Switch list vs grid" merged + + # 2015-10-26 - start of branch - PR [#745](https://github.com/owncloud/android/pull/745) merged -- 2.11.0