summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Padilla <jpadilla@webapplicate.com>2015-04-28 12:07:24 -0400
committerJosé Padilla <jpadilla@webapplicate.com>2015-04-28 12:07:24 -0400
commita125433bff60c4642d267fedbc676e500272c6ae (patch)
tree30b0005e3145855b3fcb55dee7644eb922c395f4
parent3554eddb975d01b2efebb065307ef123518fd403 (diff)
downloadpyjwt-1.2.0.tar.gz
Bump up version1.2.0
-rw-r--r--CHANGELOG.md4
-rw-r--r--jwt/__init__.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e898bc..5776d07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
[Unreleased][unreleased]
-------------------------------------------------------------------------
+
+[v1.2.0][1.2.0]
+-------------------------------------------------------------------------
### Fixed
- Added back `verify_expiration=` argument to `jwt.decode()` that was erroneously removed in [v1.1.0][1.1.0].
@@ -52,6 +55,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
[1.0.1]: https://github.com/jpadilla/pyjwt/compare/1.0.0...1.0.1
[1.0.1]: https://github.com/jpadilla/pyjwt/compare/1.0.0...1.0.1
[1.1.0]: https://github.com/jpadilla/pyjwt/compare/1.0.1...1.1.0
+[1.2.0]: https://github.com/jpadilla/pyjwt/compare/1.1.0...1.2.0
[109]: https://github.com/jpadilla/pyjwt/pull/109
[110]: https://github.com/jpadilla/pyjwt/pull/110
diff --git a/jwt/__init__.py b/jwt/__init__.py
index 78d4219..e02587d 100644
--- a/jwt/__init__.py
+++ b/jwt/__init__.py
@@ -10,7 +10,7 @@ http://self-issued.info/docs/draft-jones-json-web-token-01.html
__title__ = 'pyjwt'
-__version__ = '1.1.0'
+__version__ = '1.2.0'
__author__ = 'José Padilla'
__license__ = 'MIT'
__copyright__ = 'Copyright 2015 José Padilla'