bumped version to 0.3.40

chimpler · May 4, 2018 · 15ced6b · 15ced6b
1 parent f039370
commit 15ced6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# Version 0.3.40
+* Fix non-root ConfigTree merge onto root ConfigTree (@aalba6675) [#156]
+* Unresolved optional substitutions work with config merging (@aalba6675) [#153]
+
 # Version 0.3.39
 * Fixed self ref substitution (@aalba6675) [#142]
 * Fixed with_fallback to not mutate config (@aalba6675) [#143]

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def run_tests(self):
 
 setup(
     name='pyhocon',
-    version='0.3.39',
+    version='0.3.40',
     description='HOCON parser for Python',
     long_description='pyhocon is a HOCON parser for Python. Additionally we provide a tool (pyhocon) to convert any HOCON '
                      'content into json, yaml and properties format.',