servo: Merge #9744 - Add our CoC diffs (from larsbergstrom:coc); r=metajack
authorLars Bergstrom <lars@lars.com>
Thu, 25 Feb 2016 09:58:37 +0500
changeset 338147 4f76d0fd04018fb6c4e0a52672968c00a8084ea4
parent 338146 a499072dcedc2225cee4fcc6a9ac8080f942c42b
child 338148 fb12808be5833458d6bdd0d36924a465990b2f9d
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmetajack
servo: Merge #9744 - Add our CoC diffs (from larsbergstrom:coc); r=metajack r? @metajack This just clarifies that we are the point of contact for Servo CoC issues, not the Rust Moderation team :-) Source-Repo: https://github.com/servo/servo Source-Revision: ccacdc0c853ffb9143ab46b760e1ab076cb9ac9a
servo/CONTRIBUTING.md
--- a/servo/CONTRIBUTING.md
+++ b/servo/CONTRIBUTING.md
@@ -41,16 +41,16 @@ on how to start working on Servo.
 - Add tests relevant to the fixed bug or new feature.  For a DOM change this
   will usually be a web platform test; for layout, a reftest.  See our [testing
   guide](https://github.com/servo/servo/wiki/Testing) for more information.
 
 For specific git instructions, see [GitHub workflow 101](https://github.com/servo/servo/wiki/Github-workflow).
 
 ## 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
 
 Servo contributors frequent the `#servo` channel on [`irc.mozilla.org`](https://wiki.mozilla.org/IRC).
 
 You can also join the [`dev-servo` mailing list](https://lists.mozilla.org/listinfo/dev-servo).