summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-01-29 14:20:27 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2016-01-29 14:20:27 -0500
commit5b32344deadf371f3a5301ac4c71508eb1a6cf17 (patch)
tree76889cc32eb6f7f365663726a6cc29aae2f3c95b /src
parent80543674d13b44ca9030b83443a1d922d492df1e (diff)
parent0426a8150f126f5cfa133b64a82b33fdb0c5840b (diff)
downloadcryptography-1.2.2.tar.gz
Merge pull request #2697 from reaperhulk/1.2.2-changelog1.2.2
update changelog and version for 1.2.2
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/__about__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 8fc2e1e41..198ab4949 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes"
" and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "1.2.1"
+__version__ = "1.2.2"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"