Merge branch 'master' into feature/openapi-validation

googleforgames · Feb 22, 2018 · 4032cc2 · 4032cc2
2 parents 6c00c4d + f697a96
commit 4032cc2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,10 @@ More documentation forthcoming.
 - [Twitter](https://twitter.com/agonesdev)
 - [Mailing List](https://groups.google.com/forum/#!forum/agones-discuss) 
 
+## Code of Conduct
+
+Participation in this project comes under the [Contributor Covenant Code of Conduct](code-of-conduct.md)
+
 ## Development and Contribution
 
 Please read the [contributing](CONTRIBUTING.md) guide for directions on submitting Pull Requests to Agones.