From 6d1e313788e5c7f7449616faf587a6215a381c95 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 12 Jul 2013 04:23:45 -0400
Subject: [PATCH] Update Changelog and Upgrading instructions

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

diff --git a/CHANGELOG b/CHANGELOG
index 8dc8d4b..5d0ee97 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Simplified configuration by merging it into one file + defaults (#1487311)
+- Make message list header stay on top when scrolling (#1295420)
 - Fix bug where signature wasn't changed on identity selection when editing a draft (#1489229)
 - Fix IMAP SETMETADATA parameters quoting (#1489231)
 - Add support for 'enchant' spellcheck engine

--
Gitblit v1.9.1