From 53787d6e972e66ac646ccdac221e177c32753929 Mon Sep 17 00:00:00 2001
From: Danilo Bargen <danilo.bargen@threema.ch>
Date: Thu, 17 Jan 2019 14:38:13 +0100
Subject: [PATCH] Release v2.1.4

---
 CHANGELOG.md      | 16 ++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af4f6d4eb..ab4dce916 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ This changelog lists the most important changes for each released version. For
 the full log, please refer to the git commit history.
 
 
+### [v2.1.4][v2.1.4] (2019-01-17)
+
+Changes:
+
+* [change] Update many dependencies
+* [change] Strip sourceMappingURL lines from release files ([#709][i709])
+* [bug] Fix collapsing of consecutive whitespace in message ([#706][i706])
+* [bug] Android: Fix out-of-sync after reconnect ([#712][i712])
+* [bug] Conversations: Handle clearing of latest message ([#713][i713])
+
+
 ### [v2.1.3][v2.1.3] (2018-12-12)
 
 Changes:
@@ -646,7 +657,12 @@ First public release.
 [i689]: https://github.com/threema-ch/threema-web/issues/689
 [i690]: https://github.com/threema-ch/threema-web/issues/690
 [i691]: https://github.com/threema-ch/threema-web/issues/691
+[i706]: https://github.com/threema-ch/threema-web/issues/706
+[i709]: https://github.com/threema-ch/threema-web/issues/709
+[i712]: https://github.com/threema-ch/threema-web/issues/712
+[i713]: https://github.com/threema-ch/threema-web/issues/713
 
+[v2.1.4]: https://github.com/threema-ch/threema-web/compare/v2.1.3...v2.1.4
 [v2.1.3]: https://github.com/threema-ch/threema-web/compare/v2.1.2...v2.1.3
 [v2.1.2]: https://github.com/threema-ch/threema-web/compare/v2.1.1...v2.1.2
 [v2.1.1]: https://github.com/threema-ch/threema-web/compare/v2.1.0...v2.1.1
diff --git a/package-lock.json b/package-lock.json
index e1a514c08..18c22a83b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "threema-web",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d98a2bf24..69c4ad619 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "threema-web",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Threema Webclient",
   "scripts": {
     "build": "npm run build:js && npm run build:css",