aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorAlex Stapleton <alexs@prol.etari.at>2014-07-08 07:57:09 +0100
committerAlex Stapleton <alexs@prol.etari.at>2014-07-08 07:57:09 +0100
commit5a3e0754f94a280783e0d5b9c1082097566fa62f (patch)
tree6e335456b19a977d91bda003177f87eb9af79963 /CHANGELOG.rst
parentd329d535d0a1598eae8dd63fd6d65ab7f5d30ad4 (diff)
parent1757fe3de96bb821b19512a9df019ac7e0ad1061 (diff)
downloadcryptography-5a3e0754f94a280783e0d5b9c1082097566fa62f.tar.gz
cryptography-5a3e0754f94a280783e0d5b9c1082097566fa62f.tar.bz2
cryptography-5a3e0754f94a280783e0d5b9c1082097566fa62f.zip
Merge pull request #1227 from reaperhulk/open-for-business
open master for development on the sixth release
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 4b20cbf6..055c5abf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+0.6 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
0.5.1 - 2014-07-07
~~~~~~~~~~~~~~~~~~