diff options
| author | André Arko <mail@arko.net> | 2015-06-19 15:21:38 -0500 |
|---|---|---|
| committer | André Arko <mail@arko.net> | 2015-06-19 15:21:38 -0500 |
| commit | 535f6cab72e973b26001e1abe54f35c3ee55d228 (patch) | |
| tree | b898a44a6c228b3e44067687077a6d148ae03f7f | |
| parent | b2b7acf5370a48f17e6c381dd28c94b67aabbf99 (diff) | |
| parent | f9b2d60ed00856ba931dd6693d1c99ae8a1a9c32 (diff) | |
| download | bundler-535f6cab72e973b26001e1abe54f35c3ee55d228.tar.gz | |
Merge pull request #3766 from strand/patch-1
Integrate Code of Covenant 1.1.0 changes
[ci skip]
| -rw-r--r-- | CODE_OF_CONDUCT.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d74a43429d..ccf90bdf88 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -20,6 +20,8 @@ If you are being harassed, notice that someone else is being harassed, or have a We expect everyone to follow these rules anywhere in the Bundler project’s codebases, issue trackers, IRC channel, group chat, and mailing lists. +This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. + Finally, don't forget that it is human to make mistakes! We all do. Let’s work together to help each other, resolve issues, and learn from the mistakes that we will all inevitably make from time to time. @@ -37,4 +39,4 @@ Thanks to the [JSConf Code of Conduct](http://jsconf.com/codeofconduct.html) and <a rel="license" href="http://creativecommons.org/publicdomain/zero/1.0/"> <img src="http://i.creativecommons.org/p/zero/1.0/88x31.png" style="border-style: none;" alt="CC0"> </a> -</p>
\ No newline at end of file +</p> |