Skip to content

Commit dff33a0

Browse files
Merge pull request #596 from PowerShell/code-of-conduct
Add code of conduct and update maintainers
2 parents f29c9cf + 625fb51 commit dff33a0

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

CODE_OF_CONDUCT.md

+8
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 [[email protected]][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:[email protected]

README.md

+12-2
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,21 @@ contribute code, documentation, tests, or bug reports, please read our [Contribu
109109

110110
## Maintainers
111111

112-
- [David Wilson](https://github.com/daviwil) - [@daviwil](http://twitter.com/daviwil)
113112
- [Keith Hill](https://github.com/rkeithhill) - [@r_keith_hill](http://twitter.com/r_keith_hill)
114-
- [Kapil Borle](https://github.com/kapilmb) - [@kmborle](http://twitter.com/kmborle)
115113
- [Patrick Meinecke](https://github.com/SeeminglyScience) - [@SeeminglyScienc](http://twitter.com/SeeminglyScienc)
114+
- [Tyler Leonhardt](https://github.com/tylerl0706) - [@TylerLeonhardt](http://twitter.com/tylerleonhardt)
115+
- [David Wilson](https://github.com/daviwil) - [@daviwil](http://twitter.com/daviwil)
116116

117117
## License
118118

119119
This project is [licensed under the MIT License](LICENSE).
120+
121+
## [Code of Conduct][conduct-md]
122+
123+
This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
124+
For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [[email protected]][conduct-email] with any additional questions or comments.
125+
126+
[conduct-code]: http://opensource.microsoft.com/codeofconduct/
127+
[conduct-FAQ]: http://opensource.microsoft.com/codeofconduct/faq/
128+
[conduct-email]: mailto:[email protected]
129+
[conduct-md]: https://github.com/PowerShell/PowerShellEditorServices/blob/master/CODE_OF_CONDUCT.md

0 commit comments

Comments
 (0)