Auto merge of #9744 - larsbergstrom:coc, r=metajack

Add our CoC diffs

r? @metajack

This just clarifies that we are the point of contact for Servo CoC issues, not the Rust Moderation team :-)

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9744)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-25 10:28:07 +05:30
commit ccacdc0c85

View file

@ -46,7 +46,7 @@ For specific git instructions, see [GitHub workflow 101](https://github.com/serv
## Conduct
We follow the [Rust Code of Conduct](http://www.rust-lang.org/conduct.html).
In all Servo-related forums, we follow the [Rust Code of Conduct](http://www.rust-lang.org/conduct.html). For escalation or moderation issues, please contact Jack (jmoffitt@mozilla.com) and Lars (larsberg@mozilla.com) instead of the Rust moderation team.
## Communication