[Nostromo] Update Changelog

8 years ago · c6ec69b7f2
parent fef0fee920
commit c6ec69b7f2
1 changed files with 6 additions and 1 deletions
--- 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