aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2019-01-22 11:25:41 -0600
committerAlex Gaynor <alex.gaynor@gmail.com>2019-01-22 12:25:41 -0500
commitccf8ef3eb73bac73629dc95334df0ececb6853d3 (patch)
tree223f7677758220e35460ea474a96b6bd83f07b35 /src
parent83aa36dd407d0eb9a10e20cc35c51274174cd5bc (diff)
downloadcryptography-ccf8ef3eb73bac73629dc95334df0ececb6853d3.tar.gz
cryptography-ccf8ef3eb73bac73629dc95334df0ececb6853d3.tar.bz2
cryptography-ccf8ef3eb73bac73629dc95334df0ececb6853d3.zip
reopen master for 2.6 work (#4730)
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 02f81f6e..87890823 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__ = "2.5"
+__version__ = "2.6.dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"