From 04994005e7f83a9ae48bd177b898dd17f7aa8e24 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 13 Jan 2015 09:41:41 +0100
Subject: Fix XSS issue in style attribute handling (#1490227)

Conflicts:

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

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index e046f5e88..39597be63 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG Roundcube Webmail
 - Fix wrong icon for download button in classic skin
 - Fix bug where sent message was saved in Sent folder even if disabled by user (#1490208)
 - Fix checks based on window.ActiveXObject in IE > 10
+- Fix XSS issue in style attribute handling (#1490227)
 
 RELEASE 1.0.4
 -------------
-- 
cgit v1.2.3