Merge #21

21: note the code of conduct in the README r=japaric a=japaric

Testing PR builds

Co-authored-by: Jorge Aparicio <jorge@japaric.io>

Author: bors[bot]

CODE_OF_CONDUCT.md

@@ -1,7 +1,5 @@
 # The Rust Code of Conduct
 
-A version of this document [can be found online](https://www.rust-lang.org/conduct.html).
-
 ## Conduct
 
 **Contact**: [Cortex-M team](https://github.com/rust-embedded/wg#the-cortex-m-team)

README.md

@@ -21,6 +21,15 @@ at your option.
 
 ### Contribution
 
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the
-work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
+
+## Code of Conduct
+
+Contribution to this crate is organized under the terms of the [Rust Code of
+Conduct][CoC], the maintainer of this crate, the [Cortex-M team][team], promises
+to intervene to uphold that code of conduct.
+
+[CoC]: CODE_OF_CONDUCT.md
+[team]: https://github.com/rust-embedded/wg#the-cortex-m-team