summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.rst
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2015-04-17 09:13:48 -0700
committerTim Graham <timograham@gmail.com>2015-04-17 18:12:41 -0400
commitf043434174db3432eb63c341573c1ea89ef59b91 (patch)
tree99e0f1386718b332275629a47cbec6074596361b /CONTRIBUTING.rst
parent24003295088ec24d823f66bd5c8b917478b24c5d (diff)
downloaddjango-f043434174db3432eb63c341573c1ea89ef59b91.tar.gz
Added link to the code of conduct from contributing guides.
This is inspired by Angluar.js (https://github.com/angular/angular/blob/master/CONTRIBUTING.md), among others. Thanks to Jeff Triplett for the prod.
Diffstat (limited to 'CONTRIBUTING.rst')
-rw-r--r--CONTRIBUTING.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4a5887b117..4b2ab36366 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -24,3 +24,9 @@ Django uses Trac to keep track of bugs, feature requests, and associated
patches because GitHub doesn't provide adequate tooling for its community.
Patches can be submitted as pull requests, but if you don't file a ticket,
it's unlikely that we'll notice your contribution.
+
+Code of Conduct
+===============
+
+As a contributor, you can help us keep the Django community open and inclusive.
+Please read and follow our `Code of Conduct <https://www.djangoproject.com/conduct/>`_.