From 521bea4bd8f2e462df3cf79fa5f2230a00e1115c Mon Sep 17 00:00:00 2001
From: prashant <prashant@jois.ca>
Date: Tue, 23 Jun 2015 18:09:14 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/roundcube/roundcubemail

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

diff --git a/CHANGELOG b/CHANGELOG
index d0aee48..c838f49 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,10 @@
 - Fix bug where some messages in multi-folder search couldn't be opened (#1490426)
 - Fix unintentional messages list page change on page switch in compose addressbook (#1490427)
 - Fix race-condition in saving user preferences and loading plugin config (#1490431)
+- Fix so plain text signature field uses monospace font (#1490435)
+- Fix so links with href == content aren't added to links list on html to text conversion (#1490434)
+- Fix handling of non-break spaces in html to text conversion (#1490436)
+- Fix self-reply detection issues (#1490439)
 
 RELEASE 1.1.2
 -------------

--
Gitblit v1.9.1