aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-08-12 08:47:34 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-08-12 08:47:34 -0500
commitbff54ef395c97bfc370aff50a242134116a53275 (patch)
treef973caf076c1da285ec8482fe08d020124f3c336 /CHANGELOG.rst
parent4abba0474a751192b5abbd5a97c1817021aae337 (diff)
downloadcryptography-bff54ef395c97bfc370aff50a242134116a53275.tar.gz
cryptography-bff54ef395c97bfc370aff50a242134116a53275.tar.bz2
cryptography-bff54ef395c97bfc370aff50a242134116a53275.zip
reopen master for eleventh release
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 21319f8b..900a3365 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,12 @@
Changelog
=========
+1.1 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
+
1.0 - 2015-08-12
~~~~~~~~~~~~~~~~