From c6ec69b7f2043f7205efec1e5c973874e8d56abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= <andresmontanez@gmail.com>
Date: Sat, 4 Feb 2017 16:40:40 -0300
Subject: [PATCH] [Nostromo] Update Changelog

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef6b473..3cd88a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 CHANGELOG for 3.x
 =================
 
-* 3.0.0 (2017-01-xx)
+* 3.0.X (2017-XX-XX)
+ * [PR#330] Allow Composer task options to be overwritten at environment level
+ * [PR#330] Add new method Runtime::getMergedOption to merge ConfigOption and EnvOption
+ * [Documentation] [PR#333] Improve example config file
+
+* 3.0.0 (2017-01-31)
  * v3 series release