Skip to content

Commit

Permalink
Merge pull request #568 from PlagueHO/Issue-562
Browse files Browse the repository at this point in the history
Moved Code of Conduct into seperate file - Fixes #562
  • Loading branch information
mhendric authored Feb 18, 2019
2 parents fe73cd7 + e20457a commit 02857d3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@
- Fix an misnamed variable that causes an error during error message output.
[issue #449](https://github.com/PowerShell/xPSDesiredStateConfiguration/issues/449))
- Updates Should statements in Pester tests to use dashes before parameters.
- Added a CODE\_OF\_CONDUCT.md with the same content as in the README.md
[issue #562](https://github.com/PowerShell/xPSDesiredStateConfiguration/issues/562)

## 8.4.0.0

Expand Down
6 changes: 6 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Code of conduct

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional
questions or comments.
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@ versions going back to PowerShell 4, there is no automatic testing performed
for these versions, and thus no guarantee that the module will work as
expected.

This project has adopted the
[Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
For more information see the
[Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any
additional questions or comments.
This project has adopted [this code of conduct](CODE_OF_CONDUCT.md).

## Branches

Expand Down

0 comments on commit 02857d3

Please sign in to comment.