Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open master for 2.1 #3788

Merged
merged 1 commit into from
Jul 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
=========

2.1 - - `master`_
~~~~~~~~~~~~~~~~~

.. note:: This version is not yet released and is under active development.

2.0 - 2017-07-17
~~~~~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion src/cryptography/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
" and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"

__version__ = "2.0"
__version__ = "2.1.dev1"

__author__ = "The cryptography developers"
__email__ = "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion vectors/cryptography_vectors/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

__uri__ = "https://github.com/pyca/cryptography"

__version__ = "2.0"
__version__ = "2.1.dev1"

__author__ = "The cryptography developers"
__email__ = "[email protected]"
Expand Down