aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-11-11 21:21:16 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2018-11-11 21:21:16 -0500
commit5edac0c32baa8b9241284f3f9eebd4271bf7c57b (patch)
tree1f2836a9fadf468aac857c17e680d74dd03bac1e /CHANGELOG.rst
parentdb08466131a2d495e4bf58e34bf8d0090be04a2d (diff)
downloadcryptography-5edac0c32baa8b9241284f3f9eebd4271bf7c57b.tar.gz
cryptography-5edac0c32baa8b9241284f3f9eebd4271bf7c57b.tar.bz2
cryptography-5edac0c32baa8b9241284f3f9eebd4271bf7c57b.zip
reopen master for 2.5 development (#4571)
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6ea810cb..262c1f27 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
Changelog
=========
+.. _v2-5:
+
+2.5 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
.. _v2-4-1:
2.4.1 - 2018-11-11