From 643816b8d4b0d511e4acc36b8fd6295d8060834f Mon Sep 17 00:00:00 2001
From: Olivier Brisse <ouranos@donarproject.org>
Date: Thu, 9 Nov 2017 15:46:32 +1100
Subject: [PATCH] Preparing for 3.3.2 release

---
 CHANGELOG.md                       | 30 +++++++++++++++++++++++++++++-
 MNOE_VERSION                       |  2 +-
 core/lib/mno_enterprise/version.rb |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f34b54088..39cd394b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,35 @@
 # Change Log
 
 ## [Unreleased](https://github.com/maestrano/mno-enterprise/tree/master)
-[Full Changelog](https://github.com/maestrano/mno-enterprise/compare/v3.3.1...HEAD)
+[Full Changelog](https://github.com/maestrano/mno-enterprise/compare/v3.3.2...HEAD)
+
+## [v3.3.2](https://github.com/maestrano/mno-enterprise/tree/v3.3.2) (2017-11-09)
+[Full Changelog](https://github.com/maestrano/mno-enterprise/compare/v3.3.1...v3.3.2)
+
+**Implemented enhancements:**
+
+- \[MNOE-682\] Add Intercom to Admin Panel [\#513](https://github.com/maestrano/mno-enterprise/pull/513) ([ouranos](https://github.com/ouranos))
+- \[PF-183\] Invoice template: add bank statement mention [\#474](https://github.com/maestrano/mno-enterprise/pull/474) ([enizor](https://github.com/enizor))
+- Admin build: inject impac-angular dependency [\#412](https://github.com/maestrano/mno-enterprise/pull/412) ([ouranos](https://github.com/ouranos))
+- \[MNOE-570\] Storing the time of agreement to TOS [\#407](https://github.com/maestrano/mno-enterprise/pull/407) ([enizor](https://github.com/enizor))
+- Invoice PDF - Clarify payment processor [\#403](https://github.com/maestrano/mno-enterprise/pull/403) ([alachaum](https://github.com/alachaum))
+- \[PF-164\] Explain roles in invite modal [\#398](https://github.com/maestrano/mno-enterprise/pull/398) ([alexnoox](https://github.com/alexnoox))
+- Expose devise config in the frontend [\#384](https://github.com/maestrano/mno-enterprise/pull/384) ([ouranos](https://github.com/ouranos))
+- Expose impersonator admin\_role [\#383](https://github.com/maestrano/mno-enterprise/pull/383) ([ouranos](https://github.com/ouranos))
+- \[MNOE-447\] Dashboard templates management [\#312](https://github.com/maestrano/mno-enterprise/pull/312) ([ouranos](https://github.com/ouranos))
+
+**Fixed bugs:**
+
+- \[MNOE-699\]\[MNOE-658\] Disallow Staff impersonation [\#545](https://github.com/maestrano/mno-enterprise/pull/545) ([ouranos](https://github.com/ouranos))
+- Fix terms of use not being displayed [\#542](https://github.com/maestrano/mno-enterprise/pull/542) ([hedudelgado](https://github.com/hedudelgado))
+- \[MNOE-563\]\[MNOE-677\] Add main\_logo\_white\_bg on notifications and fix size [\#536](https://github.com/maestrano/mno-enterprise/pull/536) ([hedudelgado](https://github.com/hedudelgado))
+- Authorize staff to manage app instances [\#514](https://github.com/maestrano/mno-enterprise/pull/514) ([fgourichon](https://github.com/fgourichon))
+- Fixes - Dashboard templates [\#475](https://github.com/maestrano/mno-enterprise/pull/475) ([cesar-tonnoir](https://github.com/cesar-tonnoir))
+- \[MNOE-587\]\[Bug\] Nan average rating [\#451](https://github.com/maestrano/mno-enterprise/pull/451) ([adamaziz15](https://github.com/adamaziz15))
+- Fix intermittent 500 errors on dashboard templates controller [\#427](https://github.com/maestrano/mno-enterprise/pull/427) ([cesar-tonnoir](https://github.com/cesar-tonnoir))
+- \[MNOE-643\] Add white logo on App loading page [\#419](https://github.com/maestrano/mno-enterprise/pull/419) ([ouranos](https://github.com/ouranos))
+- Fix marketplace cache when no apps [\#406](https://github.com/maestrano/mno-enterprise/pull/406) ([ouranos](https://github.com/ouranos))
+- \[MNOE-558\] Filter out rejected comments from feedbacks [\#385](https://github.com/maestrano/mno-enterprise/pull/385) ([adamaziz15](https://github.com/adamaziz15))
 
 ## [v3.3.1](https://github.com/maestrano/mno-enterprise/tree/v3.3.1) (2017-07-24)
 [Full Changelog](https://github.com/maestrano/mno-enterprise/compare/v3.3.0...v3.3.1)
diff --git a/MNOE_VERSION b/MNOE_VERSION
index bea438e9a..477254331 100644
--- a/MNOE_VERSION
+++ b/MNOE_VERSION
@@ -1 +1 @@
-3.3.1
+3.3.2
diff --git a/core/lib/mno_enterprise/version.rb b/core/lib/mno_enterprise/version.rb
index b4f05e1c9..5710fe336 100644
--- a/core/lib/mno_enterprise/version.rb
+++ b/core/lib/mno_enterprise/version.rb
@@ -1,3 +1,3 @@
 module MnoEnterprise
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 end