From b7c740fa281a8373767c848805eba48105581fe1 Mon Sep 17 00:00:00 2001 From: Olivier Brisse Date: Mon, 5 Jun 2017 21:02:41 +1000 Subject: [PATCH] Preparing for 3.1.4 release --- CHANGELOG.md | 13 ++++++++++++- MNOE_VERSION | 2 +- core/lib/mno_enterprise/version.rb | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6fe01d18..225c1de72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,22 @@ ## [Unreleased](https://github.com/maestrano/mno-enterprise/tree/master) -[Full Changelog](https://github.com/maestrano/mno-enterprise/compare/v3.1.3...HEAD) +[Full Changelog](https://github.com/maestrano/mno-enterprise/compare/v3.1.4...HEAD) + +## [v3.1.4](https://github.com/maestrano/mno-enterprise/tree/v3.1.4) (2017-06-05) +[Full Changelog](https://github.com/maestrano/mno-enterprise/compare/v3.1.3...v3.1.4) + +**Fixed bugs:** + +- \[MNOE-358\] Fix dev mailer [\#276](https://github.com/maestrano/mno-enterprise/pull/276) ([ouranos](https://github.com/ouranos)) +- Merge [v3.0.7](#v3.0.7) ## [v3.1.3](https://github.com/maestrano/mno-enterprise/tree/v3.1.3) (2016-11-09) [Full Changelog](https://github.com/maestrano/mno-enterprise/compare/v3.1.2...v3.1.3) +**Fixed bugs:** + +- Fix built in email templates [\#149](https://github.com/maestrano/mno-enterprise/pull/149) ([ouranos](https://github.com/ouranos)) - Merge [v3.0.6](#v3.0.6) ## [v3.1.2](https://github.com/maestrano/mno-enterprise/tree/v3.1.2) (2016-09-30) diff --git a/MNOE_VERSION b/MNOE_VERSION index ff365e06b..0aec50e6e 100644 --- a/MNOE_VERSION +++ b/MNOE_VERSION @@ -1 +1 @@ -3.1.3 +3.1.4 diff --git a/core/lib/mno_enterprise/version.rb b/core/lib/mno_enterprise/version.rb index 082608d07..036504dc7 100644 --- a/core/lib/mno_enterprise/version.rb +++ b/core/lib/mno_enterprise/version.rb @@ -1,3 +1,3 @@ module MnoEnterprise - VERSION = '3.1.3' + VERSION = '3.1.4' end