bumped version to 0.3.11

chimpler · Oct 13, 2015 · b01505a · b01505a
1 parent 0a3321b
commit b01505a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+# Version 0.3.11
+
+* Added default indent to 2. PR[#47]
+* Fix dotted notation merge. PR[#49]
+
 # Version 0.3.10
 
 * Backward compatibility with imports

diff --git a/README.md b/README.md
@@ -324,6 +324,8 @@ Java properties mapping                                    | :x:
   - Tasuku Okuda ([@okdtsk](https://github.com/okdtsk))
   - Uri Laserson ([@laserson](https://github.com/laserson))
   - Bastian Kuberek ([@bkuberek](https://github.com/bkuberek))
+  - Varun Madiath ([@vamega](https://github.com/vamega))
+  - Andrey Proskurnev ([@ariloulaleelay](https://github.com/ariloulaleelay))
 
 ### Thanks
 

diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@ def run_tests(self):
 
 setup(
     name='pyhocon',
-    version='0.3.10',
+    version='0.3.11',
     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.',