Skip to content

Commit da47625

Browse files
Merge pull request #1145 from PowerShell/code-of-conduct
Add Code of Conduct and update Maintainers
2 parents f5057a1 + 2313a24 commit da47625

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

CODE_OF_CONDUCT.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Code of Conduct
2+
3+
This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
4+
For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any additional questions or comments.
5+
6+
[conduct-code]: http://opensource.microsoft.com/codeofconduct/
7+
[conduct-FAQ]: http://opensource.microsoft.com/codeofconduct/faq/
8+
[conduct-email]: mailto:opencode@microsoft.com

README.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ You have two options for sending us the logs:
119119

120120
1. If you are editing scripts that contain sensitive information (intellectual property,
121121
deployment or administrative information, etc), e-mail the logs directly to
122-
*daviwil [at] microsoft.com*
122+
*tyleonha [at] microsoft.com* or reach out to one of the [other maintainers](https://github.com/powershell/vscode-powershell#maintainers) directly.
123123

124124
2. If you are editing scripts that don't contain sensitive information, you can drag and
125125
drop your logs ZIP file into the GitHub issue that you are creating.
@@ -131,13 +131,22 @@ on how to contribute to this extension!
131131

132132
## Maintainers
133133

134-
- [David Wilson](https://github.com/daviwil) - [@daviwil](http://twitter.com/daviwil)
135134
- [Keith Hill](https://github.com/rkeithhill) - [@r_keith_hill](http://twitter.com/r_keith_hill)
136-
- [Kapil Borle](https://github.com/kapilmb) - [@kmborle](http://twitter.com/kmborle)
137-
- [Trevor Sullivan](https://github.com/pcgeek86) - [@pcgeek86](http://twitter.com/pcgeek86)
135+
- [Tyler Leonhardt](https://github.com/tylerl0706) - [@TylerLeonhardt](http://twitter.com/tylerleonhardt)
136+
- [David Wilson](https://github.com/daviwil) - [@daviwil](http://twitter.com/daviwil)
138137

139138
## License
140139

141140
This extension is [licensed under the MIT License](LICENSE.txt). Please see the
142141
[third-party notices](Third%20Party%20Notices.txt) file for details on the third-party
143142
binaries that we include with releases of this project.
143+
144+
## [Code of Conduct][conduct-md]
145+
146+
This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
147+
For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any additional questions or comments.
148+
149+
[conduct-code]: http://opensource.microsoft.com/codeofconduct/
150+
[conduct-FAQ]: http://opensource.microsoft.com/codeofconduct/faq/
151+
[conduct-email]: mailto:opencode@microsoft.com
152+
[conduct-md]: https://github.com/PowerShell/vscode-powershell/blob/master/CODE_OF_CONDUCT.md

0 commit comments

Comments
 (0)