From f1e4708d571a8552d635b88888b40ea3b8a8f2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= <edhelas@movim.eu>
Date: Sat, 19 May 2018 11:17:56 +0200
Subject: [PATCH] Update the CHANGELOG and bump the version

---
 CHANGELOG.md    | 3 +++
 VERSION         | 2 +-
 manifest.webapp | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 730110496..0be5cbb83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,9 @@ v0.14 (trunk)
  * Add support for MAM configuration
  * Add support for XEP-0153: vCard-Based Avatar
  * Allow avatars to be retrieved and set for chatrooms
+ * Remove several dependencies (heyupdate/emoji, clue/buzz-react, ramsey/uuid) and fix the versions of some of them (react/zmq, rain/raintpl, react/http)
+ * Improve handling of Emojis (by mirabilos)
+ * Improve performances by using eager loading (for Chats, Posts and Contacts related widgets)
 
 v0.13
 ---------------------------
diff --git a/VERSION b/VERSION
index 6560674fc..ca56c74f9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.14alpha
+0.14alpha2
diff --git a/manifest.webapp b/manifest.webapp
index cb52a536d..49a6a3cfb 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -1,5 +1,5 @@
 {
-    "version": "0.13.1beta",
+    "version": "0.14alpha2",
     "name": "Movim",
     "description": "Kick Ass Social Network, decentralized and fully based on XMPP ",
     "icons": {