Unverified Commit 818f5caf authored by Ian Hickson's avatar Ian Hickson Committed by GitHub

Update CODE_OF_CONDUCT.md (#94583)

parent e9553cd5
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
# Code of conduct # Code of conduct
We expect Flutter's contributors to act professionally and respectfully, and The Flutter project expects Flutter's contributors to act professionally
we expect our social spaces to be safe and dignified environments. and respectfully. Flutter contributors are expected to maintain the safety
and dignity of Flutter's social environments (such as GitHub and Discord).
Specifically: Specifically:
...@@ -13,10 +14,11 @@ Specifically: ...@@ -13,10 +14,11 @@ Specifically:
Should you experience anything that makes you feel unwelcome in Flutter's Should you experience anything that makes you feel unwelcome in Flutter's
community, please contact [conduct@flutter.dev](mailto:conduct@flutter.dev) community, please contact [conduct@flutter.dev](mailto:conduct@flutter.dev)
or, if you prefer, directly contact someone on the team, for instance or, if you prefer, directly contact someone on the project, for instance
[Hixie](mailto:ian@hixie.ch) or [Tim](mailto:timsneath@google.com). We will [Hixie](mailto:ian@hixie.ch) or [Tim](mailto:timsneath@google.com).
not tolerate harassment from anyone in Flutter's community, even outside
of Flutter's public communication channels. The Flutter project will not tolerate harassment in Flutter's
community, even outside of Flutter's public communication channels.
## Conflict resolution ## Conflict resolution
...@@ -27,7 +29,7 @@ together, try to understand each other's points of view, and work to ...@@ -27,7 +29,7 @@ together, try to understand each other's points of view, and work to
find a design that addresses everyone's concerns. find a design that addresses everyone's concerns.
This is usually sufficient to resolve issues. If you cannot come to an This is usually sufficient to resolve issues. If you cannot come to an
agreement, ask for the advice of a more senior member of the team. agreement, ask for the advice of a more senior member of the project.
Be wary of agreement by attrition, where one person argues a point Be wary of agreement by attrition, where one person argues a point
repeatedly until other participants give up in the interests of moving repeatedly until other participants give up in the interests of moving
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment