From 34f62da1f44d8104366f5040a67927821d45becf Mon Sep 17 00:00:00 2001
From: Piotr Kuczynski <piotr.kuczynski@gmail.com>
Date: Fri, 9 Feb 2018 15:53:35 +0100
Subject: [PATCH] Release version 1.7.0

---
 CHANGELOG.md          | 6 ++++++
 lib/config/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a300afa9..6ccce649 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+...
+
+## 1.7.0
+
+**New features:**
+
 * **WARNING:** `nil` values will from now on overwrite an existing value when merging configs! This change of behavior can be reverted via `config.merge_nil_values = false` in your Config initializer ([#196](https://github.com/railsconfig/config/pull/196))
 
 ## 1.6.1
diff --git a/lib/config/version.rb b/lib/config/version.rb
index 09e2fae5..e0391e56 100644
--- a/lib/config/version.rb
+++ b/lib/config/version.rb
@@ -1,3 +1,3 @@
 module Config
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
 end