From 5b3a86da57a47a723f89d8dd64ce484002b8e4bb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 09 May 2016 03:52:57 -0400
Subject: [PATCH] Merge pull request #5184 from guitarmanusa/compose_focus

---
 CHANGELOG |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2ae4e8d..1571d5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Display different confirmation text when moving messages to Trash (#5220)
 - Indicate that a collapsed thread has flagged children (#5013)
 - Implemented message/rfc822 attachment preview
 - Update to jsTimezoneDetect 1.0.6
@@ -56,6 +57,8 @@
 RELEASE 1.2-beta
 ----------------
 - Update TinyMCE to version 4.2
+- Added support for Redis session handler
+- Removed some deprecated methods: https://github.com/roundcube/roundcubemail/commit/454b0b1c
 - Remove backward compatibility "layer" of bc.php (#4902)
 - Add possibility to define date format in write operations for ldap attributes (#3956)
 - Display attachment size in compose (#1329)

--
Gitblit v1.9.1