aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-07-19 06:35:38 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2018-07-18 17:35:37 -0500
commit39a3efbfafd0f9ebed9d9ea08a885e68c97e8045 (patch)
tree5345e14f552e5daa1dee2eefcd406dc248a256d1 /CHANGELOG.rst
parent0a846e294806478770469219a26cd49dcb5502d7 (diff)
downloadcryptography-39a3efbfafd0f9ebed9d9ea08a885e68c97e8045.tar.gz
cryptography-39a3efbfafd0f9ebed9d9ea08a885e68c97e8045.tar.bz2
cryptography-39a3efbfafd0f9ebed9d9ea08a885e68c97e8045.zip
reopen master (#4359)
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 12c4d652..41026519 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
Changelog
=========
+.. _v2-4:
+
+2.4 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
.. _v2-3:
2.3 - 2018-07-18