From eddaf0b5f68c9863181b62db33bc468d38071e8a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 10 Apr 2014 02:41:34 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

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

diff --git a/CHANGELOG b/CHANGELOG
index 43cf899..d33e545 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Search across multiple folders (#1485234)
 - Improve UI integration of ACL settings
 - Drop support for PHP < 5.3.7
 - Set In-Reply-To and References for forwarded messages (#1489593)

--
Gitblit v1.9.1