aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-08-12 10:37:27 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-08-12 10:37:27 -0400
commit0998a1a6a3f390a40b74f2cb3fbb36cb07e9c63e (patch)
treef973caf076c1da285ec8482fe08d020124f3c336 /src
parent4abba0474a751192b5abbd5a97c1817021aae337 (diff)
parentbff54ef395c97bfc370aff50a242134116a53275 (diff)
downloadcryptography-0998a1a6a3f390a40b74f2cb3fbb36cb07e9c63e.tar.gz
cryptography-0998a1a6a3f390a40b74f2cb3fbb36cb07e9c63e.tar.bz2
cryptography-0998a1a6a3f390a40b74f2cb3fbb36cb07e9c63e.zip
Merge pull request #2271 from reaperhulk/eleventh-release-begins
reopen master for eleventh 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 ec537e15..d89a9fc7 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.0"
+__version__ = "1.1.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"