From d2e2a8f32e72971e63f40fe070477e2c3b5cc6bd Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 15 May 2016 09:54:50 -0400
Subject: [PATCH] Bump version to 1.2.0 (stable)

---
 CHANGELOG                           |    2 ++
 index.php                           |    4 ++--
 program/lib/Roundcube/bootstrap.php |    2 +-
 program/include/iniset.php          |    4 ++--
 README.md                           |    8 --------
 installer/index.php                 |    4 ++--
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d8aa00a..4e9d5e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+RELEASE 1.2.0
+-------------
 - Enigma: Added enigma_debug option
 - Fix message list multi-select/deselect issue (#5219)
 - Fix bug where getting HTML editor content could steal focus from other form controls (#5223)
diff --git a/README.md b/README.md
index da5cd0a..0837fec 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,6 @@
 [roundcube.net](http://roundcube.net)
 
 
-ATTENTION
----------
-This is just a snapshot from the GIT repository and is **NOT A STABLE
-version of Roundcube**. It's not recommended to replace an existing installation
-of Roundcube with this version. Also using a separate database for this
-installation is highly recommended.
-
-
 INTRODUCTION
 ------------
 Roundcube Webmail is a browser-based multilingual IMAP client with an
diff --git a/index.php b/index.php
index 9dcf773..743a9d6 100644
--- a/index.php
+++ b/index.php
@@ -2,9 +2,9 @@
 /**
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 1.2-git                                                         |
+ | Version 1.2.0                                                           |
  |                                                                         |
- | Copyright (C) 2005-2015, The Roundcube Dev Team                         |
+ | Copyright (C) 2005-2016, The Roundcube Dev Team                         |
  |                                                                         |
  | This program is free software: you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License (with exceptions   |
diff --git a/installer/index.php b/installer/index.php
index 3e9c6b7..12b3016 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -3,9 +3,9 @@
 /**
  +-------------------------------------------------------------------------+
  | Roundcube Webmail setup tool                                            |
- | Version 1.2-git                                                         |
+ | Version 1.2.0                                                           |
  |                                                                         |
- | Copyright (C) 2009-2015, The Roundcube Dev Team                         |
+ | Copyright (C) 2009-2016, The Roundcube Dev Team                         |
  |                                                                         |
  | This program is free software: you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License (with exceptions   |
diff --git a/program/include/iniset.php b/program/include/iniset.php
index a2685e5..6db710b 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -5,7 +5,7 @@
  | program/include/iniset.php                                            |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2015, The Roundcube Dev Team                       |
+ | Copyright (C) 2008-2016, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,7 @@
 */
 
 // application constants
-define('RCMAIL_VERSION', '1.2-git');
+define('RCMAIL_VERSION', '1.2.0');
 define('RCMAIL_START', microtime(true));
 
 if (!defined('INSTALL_PATH')) {
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index f9d9b69..ebb10d8 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -55,7 +55,7 @@
 }
 
 // framework constants
-define('RCUBE_VERSION', '1.2-git');
+define('RCUBE_VERSION', '1.2.0');
 define('RCUBE_CHARSET', 'UTF-8');
 
 if (!defined('RCUBE_LIB_DIR')) {

--
Gitblit v1.9.1