Merge pull request #49 from hfaran/develop

Release 1.0.0
hfaran · Nov 22, 2014 · 11290fe · 11290fe
2 parents 14e1a8b + c50d115
commit 11290fe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -5,6 +5,12 @@ _
 ---------
 
 
+1.0.0
+~~~~~
+
+* Compatibility updates for ``tornado>=4.0.0``
+
+
 v0.41
 ~~~~~
 

diff --git a/tornado_json/__init__.py b/tornado_json/__init__.py
@@ -5,4 +5,4 @@
 # Alternatively, just put the version in a text file or something to avoid
 #   this.
 
-__version__ = '0.41'
+__version__ = '1.0.0'
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,12 @@ _ @@
     ---------
+.0.0
+    ~~~~~
+    * Compatibility updates for ``tornado>=4.0.0``
     v0.41
     ~~~~~
@@ Expand Down @@