From 25bc871ee79a6d469822d999b09c9b5d73fccf1f Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 17 Apr 2016 12:22:20 -0400
Subject: [PATCH] Bump version to 1.1.5

---
 CHANGELOG                           |    4 +++-
 index.php                           |    2 +-
 program/lib/Roundcube/bootstrap.php |    2 +-
 program/include/iniset.php          |    2 +-
 installer/index.php                 |    2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 17450ba..3dbe59f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,10 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+RELEASE 1.1.5
+-------------
 - Plugin API: Add html2text hook
+- Plugin API: Added addressbook_export hook
 - Fix missing emoticons on html-to-text conversion
 - Fix random "access to this resource is secured against CSRF" message at logout (#4956)
 - Fix missing language name in "Add to Dictionary" request in HTML mode (#4951)
@@ -10,7 +13,6 @@
 - Fix (again) security issue in DBMail driver of password plugin [CVE-2015-2181] (#4958)
 - Fix bug where Archive/Junk buttons were not active after page jump with select=all mode (#4961)
 - Fix bug in long recipients list parsing for cases where recipient name contained @-char (#4964)
-- Plugin API: Added addressbook_export hook
 - Fix additional_message_headers plugin compatibility with Mail_Mime >= 1.9 (#4966)
 - Hide DSN option in Preferences when smtp_server is not used (#4967)
 - Protect download urls against CSRF using unique request tokens (#4957)
diff --git a/index.php b/index.php
index 1d40b8b..f7758cb 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 1.1.4                                                           |
+ | Version 1.1.5                                                           |
  |                                                                         |
  | Copyright (C) 2005-2015, The Roundcube Dev Team                         |
  |                                                                         |
diff --git a/installer/index.php b/installer/index.php
index c7dc4cf..d310ede 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -3,7 +3,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail setup tool                                            |
- | Version 1.1.4                                                           |
+ | Version 1.1.5                                                           |
  |                                                                         |
  | Copyright (C) 2009-2015, The Roundcube Dev Team                         |
  |                                                                         |
diff --git a/program/include/iniset.php b/program/include/iniset.php
index c7dedf9..534d5ca 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -21,7 +21,7 @@
 */
 
 // application constants
-define('RCMAIL_VERSION', '1.1.4');
+define('RCMAIL_VERSION', '1.1.5');
 define('RCMAIL_START', microtime(true));
 
 if (!defined('INSTALL_PATH')) {
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 17139ca..7f866fc 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -54,7 +54,7 @@
 }
 
 // framework constants
-define('RCUBE_VERSION', '1.1.4');
+define('RCUBE_VERSION', '1.1.5');
 define('RCUBE_CHARSET', 'UTF-8');
 
 if (!defined('RCUBE_LIB_DIR')) {

--
Gitblit v1.9.1