aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
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 /CHANGELOG.rst
parent83aa36dd407d0eb9a10e20cc35c51274174cd5bc (diff)
downloadcryptography-ccf8ef3eb73bac73629dc95334df0ececb6853d3.tar.gz
cryptography-ccf8ef3eb73bac73629dc95334df0ececb6853d3.tar.bz2
cryptography-ccf8ef3eb73bac73629dc95334df0ececb6853d3.zip
reopen master for 2.6 work (#4730)
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7ee6d4d9..cbf032eb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,14 @@
Changelog
=========
+.. _v2-6:
+
+2.6 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
+
.. _v2-5:
2.5 - 2019-01-22