Merge remote-tracking branch 'upstream/master' into commands

This commit is contained in:
0x22 2019-09-20 16:29:54 -04:00
commit 5a83b791bb
No known key found for this signature in database
GPG Key ID: E6FBD2F5F69065FD

View File

@ -14,10 +14,10 @@ appearance, race, religion, or sexual identity and orientation.
Examples of behavior that contributes to creating a positive environment
include:
* No Anime
* No Anime (including uwu's or owo's)
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Giving and gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
@ -29,7 +29,7 @@ Examples of unacceptable behavior by participants include:
* ~~Trolling, insulting/derogatory comments, and personal or political attacks~~
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
address, without explicit permission or consent
* Other conduct which could reasonably be considered inappropriate in a
professional setting