Merge pull request #51 from lyft/code-of-conduct

Add a code of conduct
lyft · Mar 17, 2016 · 4412f71 · 4412f71
2 parents 6342fb3 + 314e92b
commit 4412f71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+This project is governed by [Lyft's code of conduct](https://github.com/lyft/code-of-conduct). All contributors and participants agree to abide by its terms.
diff --git a/docs/source/advanced/contributing.html.markdown b/docs/source/advanced/contributing.html.markdown
@@ -4,6 +4,11 @@ title: Contributing
 
 # Contributing
 
+## Code of conduct
+
+This project is governed by [Lyft's code of conduct](https://github.com/lyft/code-of-conduct).
+All contributors and participants agree to abide by its terms.
+
 ## Contributing code
 
 ### Sign the Contributor License Agreement (CLA)