Ship version 1.2.0

danielsdeleo · Nov 16, 2017 · 9acbc85 · 9acbc85
1 parent 86f15a0
commit 9acbc85
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+2017-11-16 Jason Frey <[email protected]>
+  * Ship version 1.2.0
+
+2017-04-25 Joe Rafaniello <[email protected]>
+  * Merge nil values or keep the original via an option
+
 2016-08-01 Jason Frey <[email protected]>
   * Ship version 1.1.1
 

diff --git a/deep_merge.gemspec b/deep_merge.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deep_merge}
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.authors = ["Steve Midgley"]
   s.date = %q{2016-08-01}