From da9476b4eb9622a40f6dcf8eafc2eda517044ef9 Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Tue, 6 Oct 2015 14:08:36 +0100 Subject: [PATCH 1/2] Added disclaimer to code of conduct application --- CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONDUCT.md b/CONDUCT.md index 01b8644..b2bf1ee 100644 --- a/CONDUCT.md +++ b/CONDUCT.md @@ -15,7 +15,7 @@ Examples of unacceptable behavior by participants include: Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. -This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community in a direct capacity. Personal views, beliefs and values of individuals do not necessarily reflect those of The League of Extraordinary Packages or other maintainers and contributors. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers. From f8656ea0e0c5e623069a188a23e5729d48d93104 Mon Sep 17 00:00:00 2001 From: Alex Bilbie Date: Tue, 6 Oct 2015 16:59:46 +0100 Subject: [PATCH 2/2] Update CONDUCT.md --- CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONDUCT.md b/CONDUCT.md index b2bf1ee..6ff94ca 100644 --- a/CONDUCT.md +++ b/CONDUCT.md @@ -15,7 +15,7 @@ Examples of unacceptable behavior by participants include: Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team. -This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community in a direct capacity. Personal views, beliefs and values of individuals do not necessarily reflect those of The League of Extraordinary Packages or other maintainers and contributors. +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community in a direct capacity. Personal views, beliefs and values of individuals do not necessarily reflect those of the organisation or affiliated individuals and organisations. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.