Release version 1.4.0

rubyconfig · Dec 20, 2016 · 32848b6 · 32848b6
1 parent fea0b18
commit 32848b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 # Changelog
 
-## ...
+## 1.4.0
 
-* Added support for passing a raw ruby hash into to both `Settings.add_source!` and `Settings.prepend_source!`.
+* Added support for passing a raw ruby hash into to both `Settings.add_source!` and `Settings.prepend_source!` ([#108](https://github.com/railsconfig/config/pull/159) thanks to [@halloffame](https://github.com/halloffame))
+* Added new reserved name `test` ([#158](https://github.com/railsconfig/config/pull/158) thanks to [@milushov](https://github.com/milushov))
+* `to_hash` should not replace nested config objects with Hash ([#160](https://github.com/railsconfig/config/issues/160) thanks to [@seikichi](https://github.com/seikichi))
 
 ## 1.3.0
 

diff --git a/lib/config/version.rb b/lib/config/version.rb
@@ -1,3 +1,3 @@
 module Config
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end