From ad65426c83ea421b6286ee1c5d4f0952535c04c5 Mon Sep 17 00:00:00 2001
From: Ben Einaudi <benjamin.einaudi@orange.com>
Date: Fri, 24 Feb 2017 17:02:00 +0100
Subject: [PATCH] Change version and changelog

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e03884b..55c1966 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="2.4.0"></a>
+# 2.4.0 (2017-02-24)
+
+
+### Features
+
+* **server:** Allow to be run in docker by providing a docker file ([ad39ded](https://github.com/Orange-OpenSource/just-drop-it/commit/ad39ded))
+* **server:** Update to nodejs 6 ([4aec631](https://github.com/Orange-OpenSource/just-drop-it/commit/4aec631)), closes [#16](https://github.com/Orange-OpenSource/just-drop-it/issues/16)
+
+
+
 <a name="2.3.0"></a>
 # 2.3.0 (2016-12-14)
 
diff --git a/package.json b/package.json
index a076aed..0f9313f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Just-Drop-It",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Simply beam files between two browsers",
   "keywords": [
     "Transfer",
@@ -40,7 +40,8 @@
     "mocha": "~2.2.5",
     "mockery": "~1.4.0",
     "should": "~7.0.0",
-    "request": "~2.58.0"
+    "request": "~2.58.0",
+    "conventional-changelog-cli": "~1.2.0"
   },
   "bundleDependencies": [],
   "private": true,