auto merge of #1649 : mrshu/servo/patch-1, r=larsbergstrom

It seems that the correct link is https://github.com/mozilla/rust/wiki/Note-development-policy#wiki-conduct now whereas it was https://github.com/mozilla/rust/wiki/Note-development-policy#conduct before.
This commit is contained in:
bors-servo 2014-02-09 11:37:46 -05:00
commit 8486ba4325

View file

@ -33,7 +33,7 @@ For specific git instructions, see [GitHub & Critic PR handling 101](https://git
## Conduct
We follow the [Rust Code of Conduct](https://github.com/mozilla/rust/wiki/Note-development-policy#conduct).
We follow the [Rust Code of Conduct](https://github.com/mozilla/rust/wiki/Note-development-policy#wiki-conduct).
## Communication