Merge pull request #270 from Charlotteis/patch-1

 #268: Update CoC w/ 'gender identity and expression'

Author: steveklabnik

conduct.md

@@ -9,7 +9,7 @@ title: The Rust Code of Conduct · The Rust Programming Language
 
 **Contact**: [[email protected]](mailto:[email protected])
 
-* We are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, disability, ethnicity, religion, or similar personal characteristic.
+* We are committed to providing a friendly, safe and welcoming environment for all, regardless of gender identity and expression, sexual orientation, disability, ethnicity, religion, or similar personal characteristic.
 * On IRC, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all.
 * Please be kind and courteous. There's no need to be mean or rude.
 * Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.