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/community.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/community.rst')
| -rw-r--r-- | docs/community.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/community.rst b/docs/community.rst index 552318da..bf1cd1c7 100644 --- a/docs/community.rst +++ b/docs/community.rst @@ -9,7 +9,12 @@ You can find ``cryptography`` all over the web: * `Documentation`_ * IRC: ``#cryptography-dev`` on ``irc.freenode.net`` +Wherever we interact, we strive to follow the `Python Community Code of +Conduct`_. + + .. _`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.io/ +.. _`Python Community Code of Conduct`: http://www.python.org/psf/codeofconduct/ |