From 2c97b680a8ccb5c03bb77cabfa334fe339c10b83 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 5 Jan 2016 14:33:01 -0500 Subject: [PATCH] Preparation for release 2.3.5 --- Documentation/docinfo.xml | 6 +++--- Documentation/includes/global-attributes.asciidoc | 2 +- NEWS | 4 ++-- Version | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml index c0ae790f1..aeafc1929 100644 --- a/Documentation/docinfo.xml +++ b/Documentation/docinfo.xml @@ -1,7 +1,7 @@ -Version 2.3.4 - December 2015 -for version 2.3.4 -2015-12-15 +Version 2.3.5 - January 2016 +for version 2.3.5 +2016-01-05 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License". diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc index c221bafdd..e32a7d9f0 100644 --- a/Documentation/includes/global-attributes.asciidoc +++ b/Documentation/includes/global-attributes.asciidoc @@ -13,6 +13,6 @@ // TODO have the build system take care of this -:release_version: 2.3.4 +:release_version: 2.3.5 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab: diff --git a/NEWS b/NEWS index 045c3d177..5e2f37e46 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -2.3.5 (2016-01-DD) +2.3.5 (2016-01-05) ------------------ Enhancements @@ -22,7 +22,6 @@ Bug fixes - accepted & updated event names are now shown correctly in Outlook - provide safe guards in mail and calendar to avoid exceptions while syncing - 2.3.4 (2015-12-15) ------------------ @@ -31,6 +30,7 @@ New features Enhancements - limit the maximum width of toolbar buttons (#3381) + - updated CKEditor to version 4.5.6 Bug fixes - JavaScript exception when printing events from calendars with no assigned color (#3203) diff --git a/Version b/Version index 5ad9a808f..447b58a47 100644 --- a/Version +++ b/Version @@ -4,4 +4,4 @@ MAJOR_VERSION=2 MINOR_VERSION=3 -SUBMINOR_VERSION=4 +SUBMINOR_VERSION=5