diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-20 13:26:21 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-20 13:26:21 -0800 |
| commit | dfee2f9522dac7c49a5d71e92397f182c20a259f (patch) | |
| tree | df24916fb27a37963483380a7f1612be53864684 | |
| parent | 6a364d5262905d00ae422d24d91af822b87e899d (diff) | |
| parent | f933572455291e10c0a1a2352cb5eb0fd2716b43 (diff) | |
| download | cryptography-dfee2f9522dac7c49a5d71e92397f182c20a259f.tar.gz cryptography-dfee2f9522dac7c49a5d71e92397f182c20a259f.tar.bz2 cryptography-dfee2f9522dac7c49a5d71e92397f182c20a259f.zip | |
Merge pull request #655 from reaperhulk/third-release-open-for-business
Reopen master for third release development
| -rw-r--r-- | cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | docs/changelog.rst | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 2d2c698d..21e56ac0 100644 --- a/cryptography/__about__.py +++ b/cryptography/__about__.py @@ -22,7 +22,7 @@ __summary__ = ("cryptography is a package designed to expose cryptographic " "recipes and primitives to Python developers.") __uri__ = "https://github.com/pyca/cryptography" -__version__ = "0.2" +__version__ = "0.3.dev1" __author__ = "The cryptography developers" __email__ = "cryptography-dev@python.org" diff --git a/docs/changelog.rst b/docs/changelog.rst index d800c77f..b4c9a55b 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,11 @@ Changelog ========= +0.3 - 2014-XX-XX +~~~~~~~~~~~~~~~~ + +**In development** + 0.2 - 2014-02-20 ~~~~~~~~~~~~~~~~ |