diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-04 14:44:59 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-04 14:44:59 -0800 |
| commit | 4bdb6b54f56618a2d2cf73903b3b117436fe9fb8 (patch) | |
| tree | 1564feaf49472df7014f8c9484aa72e8486846b3 /docs/index.rst | |
| parent | 7e262a6d730f45d40645323c8462b4c480fe7319 (diff) | |
| parent | 79eaa7efa2aaafd62ffeee7385526f14647e5a7e (diff) | |
| download | cryptography-4bdb6b54f56618a2d2cf73903b3b117436fe9fb8.tar.gz cryptography-4bdb6b54f56618a2d2cf73903b3b117436fe9fb8.tar.bz2 cryptography-4bdb6b54f56618a2d2cf73903b3b117436fe9fb8.zip | |
Merge branch 'master' into more-error-condition
Conflicts:
tests/hazmat/bindings/test_openssl.py
Diffstat (limited to 'docs/index.rst')
| -rw-r--r-- | docs/index.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/index.rst b/docs/index.rst index eb30b5dd..1b88e24e 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -32,6 +32,7 @@ Contents architecture exceptions + glossary contributing security community |