summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJonathan Huot <JonathanHuot@users.noreply.github.com>2018-08-18 00:31:40 +0200
committerGitHub <noreply@github.com>2018-08-18 00:31:40 +0200
commit4516651b5592abce72eaab851fcd5f63180571e6 (patch)
tree0d88ab493e6a7f45ffd1f34534636ea3f4916e2e /docs
parent6b00071b793067dfff8b42391692123023966075 (diff)
parentef0a2dda25da9f340223ee51dfd823a1ec8f1f1d (diff)
downloadoauthlib-348_SEO.tar.gz
Merge branch 'master' into 348_SEO348_SEO
Diffstat (limited to 'docs')
-rw-r--r--docs/contributing.rst25
1 files changed, 25 insertions, 0 deletions
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 3a23d70..cbdb519 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -30,6 +30,31 @@ personal label matching your GitHub ID will be assigned to that issue.
Feel free to propose issues that aren't described!
+oauthlib community rules
+========================
+
+oauthlib is a community of developers which adheres to a very simple set of
+rules.
+
+Code of Conduct
+---------------
+This project adheres to a `Code of Conduct`_ based on Django. As a community
+member you have to read and agree with it.
+
+For more information please contact us and/or visit the original
+`Django Code of Conduct`_ homepage.
+
+.. _`Code of Conduct`: https://github.com/oauthlib/oauthlib/blob/master/CODE_OF_CONDUCT.md
+.. _`Django Code of Conduct`: https://www.djangoproject.com/conduct/
+
+Code of Merit
+-------------
+Please read the community's `Code of Merit`_. Every contributor will know the
+real purpose of their contributions to this project.
+
+.. _`Code of Merit`: http://code-of-merit.org/
+
+
Setting up topic branches and generating pull requests
======================================================