aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-10-28 19:57:40 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-10-28 19:57:40 -0400
commit46a07705f1b9b6a4228eb56620f394675d4612f3 (patch)
treec74f77bf80d73950c52464d156be3afef2cd05b0 /src
parent246a44e78c0d370452b3c5508d5fdabbb1b04c99 (diff)
parentc5b430f7ec091c02017fd07c7871ea0a4b2de044 (diff)
downloadcryptography-46a07705f1b9b6a4228eb56620f394675d4612f3.tar.gz
cryptography-46a07705f1b9b6a4228eb56620f394675d4612f3.tar.bz2
cryptography-46a07705f1b9b6a4228eb56620f394675d4612f3.zip
Merge pull request #2454 from reaperhulk/reopen-master
reopen master for development on the twelfth release
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 013ca3a9..fbc1e735 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.1"
+__version__ = "1.2.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"