aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-03-18 20:33:48 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-03-18 20:33:48 -0400
commitf3944404d9a73ad983b1fef05c4e2450e85bf544 (patch)
treeee2ca859dc6339e5375807d5dc22159833bffa51 /src
parentbf1566ec4be14110cbca5a36ee339a76ac9f6272 (diff)
parentf8c75fc284d48da8d92b1dea9d962bfbc692e448 (diff)
downloadcryptography-f3944404d9a73ad983b1fef05c4e2450e85bf544.tar.gz
cryptography-f3944404d9a73ad983b1fef05c4e2450e85bf544.tar.bz2
cryptography-f3944404d9a73ad983b1fef05c4e2450e85bf544.zip
Merge pull request #2839 from alex/open-14
Open master back up for 1.4
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 c17f576a..3b985e3f 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.3"
+__version__ = "1.4dev1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"