aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-05-29 23:10:39 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2017-05-29 22:10:39 -0500
commitb90e8d81a3814331fafc732fa0f2d44f5f71dfbb (patch)
tree249aca2c9df033f85179a02037d9fd97cfe5f145 /CHANGELOG.rst
parent23ead43fd70df17828937dac9521df1753ce9407 (diff)
downloadcryptography-b90e8d81a3814331fafc732fa0f2d44f5f71dfbb.tar.gz
cryptography-b90e8d81a3814331fafc732fa0f2d44f5f71dfbb.tar.bz2
cryptography-b90e8d81a3814331fafc732fa0f2d44f5f71dfbb.zip
Post release tasks to open master for 2.0 (#3644)
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c0d16967..484bcf06 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+2.0 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
1.9 - 2017-05-29
~~~~~~~~~~~~~~~~