diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-18 19:54:45 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-18 19:54:45 -0400 |
| commit | f8c75fc284d48da8d92b1dea9d962bfbc692e448 (patch) | |
| tree | ee2ca859dc6339e5375807d5dc22159833bffa51 | |
| parent | bf1566ec4be14110cbca5a36ee339a76ac9f6272 (diff) | |
| download | cryptography-f8c75fc284d48da8d92b1dea9d962bfbc692e448.tar.gz cryptography-f8c75fc284d48da8d92b1dea9d962bfbc692e448.tar.bz2 cryptography-f8c75fc284d48da8d92b1dea9d962bfbc692e448.zip | |
Open master back up for 1.4
| -rw-r--r-- | CHANGELOG.rst | 6 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d7aefd69..00ca808b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,12 @@ Changelog ========= +1.4 - `master`_ +~~~~~~~~~~~~~~~ + +.. note:: This version is not yet released and is under active development. + + 1.3 - 2016-03-18 ~~~~~~~~~~~~~~~~ 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" diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py index 0e0296a6..e6278b52 100644 --- a/vectors/cryptography_vectors/__about__.py +++ b/vectors/cryptography_vectors/__about__.py @@ -14,7 +14,7 @@ __summary__ = "Test vectors for the cryptography package." __uri__ = "https://github.com/pyca/cryptography" -__version__ = "1.3" +__version__ = "1.4dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" |