merge from upstream, deconflict

This commit is contained in:
2022-02-11 20:25:21 +01:00

View File

@@ -365,15 +365,6 @@
* **Topics**: Language basics, rustc development (especially diagnostics)
* **Timezone**: PST (GMT-8)
### Andrew Lilley Brinker ([@alilleybrinker](https://github.com/alilleybrinker))
* **Pronouns**: he/him
* **Contact**: Twitter ([@alilleybrinker](https://twitter.com/alilleybrinker))
* **Spoken Languages**: English
* **Topics**: Software security, software assurance, software supply chain security.
* **Timezone**: PST (GMT-8)
* **Additional Resources**:
* [Possible Rust](https://www.possiblerust.com/)
### Tyler Neely ([@spacejam](https://github.com/spacejam))
* **Contact**: Discord ([@spacejam#5759 on the Rust discord](https://discord.gg/rust-lang))
* **Spoken Languages**: English
@@ -428,6 +419,15 @@
* **Additional Resources**:
- My Blog - [The Command Line](https://thecommandline.net)
### Narasimha Prasanna HN ([@Narasimha1997](https://github.com/Narasimha1997))
* **Pronouns**: he/him
* **Contact**: Twitter ([@prasannahn1997](https://twitter.com/prasannahn1997)), Discord: ([prasanna1997#0309](ttps://discordapp.com/invite/rust-lang)), E-mail: ([narasimhaprasannahn@gmail.com](mailto:narasimhaprasannahn@gmail.com?subject=Rust%20Mentorship)), Linkedin: [Narasimha Prasanna HN](https://www.linkedin.com/in/narasimha-prasanna-hn-17aa89146/)
* **Spoken Languages**: English, Hindi
* **Topics**: Programming Languages, System Programming, Web Development, DevOps, Microservices
* **Timezone**: IST (GMT+5:30)
* **Additional Resources**:
- My Website - [Narasimha1997.github.io](https://narasimha1997.github.io/#/)
<h1 id="mentors-end"></h1>
<script>
@@ -489,7 +489,4 @@ Array
.includes(el.innerText)
)
.forEach(el => addAnchorLink(el))
</script>