From 2196503caefc40fafb1233f57125c9edb23ce6f3 Mon Sep 17 00:00:00 2001
From: Andris Reinman <andris@kreata.ee>
Date: Mon, 25 Apr 2016 16:30:05 +0300
Subject: [PATCH] v1.2.0

---
 CHANGELOG.txt | 16 ++++++++++++++++
 package.json  |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.txt

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
new file mode 100644
index 00000000..d0108cbc
--- /dev/null
+++ b/CHANGELOG.txt
@@ -0,0 +1,16 @@
+# Changelog
+
+## 1.2.0 2016-04-25
+
+  * Rewrite merge tags in links (allows using links like `http://example.com/?u=[FIRST_NAME]` in messages)
+  * Added view for Imports to list failed addresses
+  * Automatic SQL table creation on initial run (no need for the `mysql` command anymore)
+  * Automatic SQL table updates on startup
+  * Send welcome and unsubscribe confirmation emails for subscribers
+  * Added support for GPG encryption for outgoing messages (requires custom field "GPG Key" set up for the list)
+  * Added new SMTP option: allow self-signed certs
+  * Added new setting: Disable WYSIWG editor (allows better handling of complex HTML templates)
+  * Allow downgrading user when server started as root (user is downgraded once all ports are bound)
+  * Added Nitrous.io one-click install button for easy try-out
+  * Added Max Post Size option to allow larger payloads from bounce webhooks
+  * Added VERP support to catch bounces using built in VERP smtp-server (disabled by default)
diff --git a/package.json b/package.json
index afa79c62..7272b941 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mailtrain",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Self hosted email newsletter app",
   "main": "index.js",
   "scripts": {