projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e865419)
Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:02:00 +0000 (18:02 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:02:00 +0000 (18:02 +0100)
# Conflicts:
# res/menu/file_actions_menu.xml
# src/com/owncloud/android/ui/fragment/OCFileListFragment.java
# src/com/owncloud/android/utils/DisplayUtils.java

CHANGELOG.md patch | blob | blame | history

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6436dc0..10d2244 100644 (file)
--- 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
ownCloud Android App