From a3989926e35e7e41090c501849ccad9de5e91ecd Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 6 Jun 2016 16:12:08 -0400 Subject: [PATCH] Preparation for release 3.1.2 --- Documentation/docinfo.xml | 6 +++--- Documentation/includes/global-attributes.asciidoc | 2 +- NEWS | 5 ++++- Version | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml index 419b7dd8a..a040f8907 100644 --- a/Documentation/docinfo.xml +++ b/Documentation/docinfo.xml @@ -1,7 +1,7 @@ -Version 3.1.1 - June 2016 -for version 3.1.1 -2016-06-02 +Version 3.1.2 - June 2016 +for version 3.1.2 +2016-06-06 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 d1d2f6ac8..1ad4ab950 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: 3.1.1 +:release_version: 3.1.2 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab: diff --git a/NEWS b/NEWS index 9f61c4ebe..2bd232477 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ -3.1.2 (2016-MM-DD) +3.1.2 (2016-06-06) ------------------ +Enhancements + - [web] updated Angular Material to version 1.1.0rc5 + Bug fixes - [web] fixed error handling when renaming a mailbox - [web] fixed user removal from ACLs in Administration module (#3713) diff --git a/Version b/Version index f77c8f957..8081bbc48 100644 --- a/Version +++ b/Version @@ -4,4 +4,4 @@ MAJOR_VERSION=3 MINOR_VERSION=1 -SUBMINOR_VERSION=1 +SUBMINOR_VERSION=2