From f69f2fb061c569a5e3969fca2c19ed8d0494f04e Mon Sep 17 00:00:00 2001
From: meriadec <meriadec.pillet@gmail.com>
Date: Fri, 12 May 2017 11:11:37 +0200
Subject: [PATCH] 2.2.0

---
 CHANGELOG.md     | 11 ++++++++++-
 app/package.json |  2 +-
 package.json     |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9baa18b5..a21e6a51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,13 @@
-### 2.0.1 (2017-05-01)
+### 2.2.0 (2017-05-12)
+
+- Export desktop & mobile view to image ([#120](https://github.com/mjmlio/mjml-app/issues/120))
+- Option to automatically fold lines based on indentation level ([#117](https://github.com/mjmlio/mjml-app/issues/117))
+- Option to highlight matching tags ([#116](https://github.com/mjmlio/mjml-app/issues/116))
+- Button to beautify MJML ([#96](https://github.com/mjmlio/mjml-app/issues/96))
+- Keep history by file when switching file
+- Preview images directly in app (to be improved)
+
+### 2.1.0 (2017-05-01)
 
 - Link to online documentation in app menu ([#109](https://github.com/mjmlio/mjml-app/issues/109))
 - Display project name in project view ([#108](https://github.com/mjmlio/mjml-app/issues/108))
diff --git a/app/package.json b/app/package.json
index 93031c9f..b4445564 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mjml-app",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "productName": "MJML",
   "description": "The desktop app for MJML",
   "main": "./main.js",
diff --git a/package.json b/package.json
index 919bfc71..46f933c9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "mjml-app",
   "productName": "MJML",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "The desktop app for MJML",
   "main": "app/main.js",
   "scripts": {