diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-21 14:44:42 -0700 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-10-21 14:44:42 -0700 |
commit | 6f874ff9279376b6962c514ae0e59b90e7082e15 (patch) | |
tree | dcbc2e2491bffc6ad19eea41bbeeba85d65a48b3 /docs/community.rst | |
parent | d6644815913e878462aa51c95c84e6d871406e27 (diff) | |
parent | 71ed449ffe7e26e9217b6c44bb27e19996315a64 (diff) | |
download | cryptography-6f874ff9279376b6962c514ae0e59b90e7082e15.tar.gz cryptography-6f874ff9279376b6962c514ae0e59b90e7082e15.tar.bz2 cryptography-6f874ff9279376b6962c514ae0e59b90e7082e15.zip |
Merge branch 'master' into refactor-cipher-names
Conflicts:
cryptography/bindings/openssl/api.py
Diffstat (limited to 'docs/community.rst')
-rw-r--r-- | docs/community.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/community.rst b/docs/community.rst index 86ba5055..552318da 100644 --- a/docs/community.rst +++ b/docs/community.rst @@ -12,4 +12,4 @@ You can find ``cryptography`` all over the web: .. _`Mailing list`: https://mail.python.org/mailman/listinfo/cryptography-dev .. _`Source code`: https://github.com/pyca/cryptography .. _`Issue tracker`: https://github.com/pyca/cryptography/issues -.. _`Documentation`: https://cryptography.readthedocs.org/ +.. _`Documentation`: https://cryptography.io/ |