From b9014db990cf943862e0f5b3f3351649f673a848 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 18 Dec 2014 10:22:29 -0500
Subject: [PATCH] Update Changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index 5b541cd..544925d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,11 +3,13 @@
 
 - Improve system security by using optional special URL with security token - use_secure_urls
 - Allow to define separate server/path for image/js/css files - assets_url/assets_dir
+- Sync vendor folder if exists in source package (#1490145)
+- Avoid useless reloading list when resetting search with active filter (#1490057)
+- Fix invalid folder selection if clicked while busy (#1490158)
 - Fix import of multiple contact email addresses from Outlook-csv format (#1490169)
 - Fix drag-n-drop to folders expanded while dragging (#1490157)
 - Fix import of multiple contact groups from Google-csv format (#1490159)
 - Fix import of contacts with multiple email addresses from Google-csv format (#1490178)
-- Fix generation of Blowfish-based password hashes (#1490184)
 - Fix bugs where CSRF attacks were still possible on some requests
 
 RELEASE 1.1-beta
@@ -66,6 +68,10 @@
 - Fix some character sets detection (#1490135)
 - Fix so attachment charset is set in headers of forward/draft message (#1490109)
 - Fix bug where wrong charset could be used for text attachment preview page (#1490106)
+
+RELEASE 1.0.4
+-------------
+- Fix generation of Blowfish-based password hashes (#1490184)
 - Fix setting flags on servers with no PERMANENTFLAGS response (#1490087)
 - Fix regression in SHAA password generation in ldap driver of password plugin (#1490094)
 - Fix displaying of HTML messages with absolutely positioned elements in Larry skin (#1490103)

--
Gitblit v1.9.1