From 3b55da7ba60bafaae5b20e0e39a3d6304001d08a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 16 Jun 2014 14:13:58 +0200
Subject: Add config option to specify IMAP connection socket parameters -
 imap_conn_options (#1489948)

Conflicts:
	CHANGELOG
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index 3a8b48e71..daa2b7fe0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Add option to specify IMAP connection socket parameters - imap_conn_options (#1489948)
 - Add option to set default message list mode - default_list_mode (#1487312)
 - Enable contextmenu plugin for TinyMCE editor (#1487014)
 - Fix some mime-type to extension mapping checks in Installer (#1489983)
-- 
cgit v1.2.3