Merge branch 'master' into marketplace_integration

googleforgames · Jan 30, 2019 · 3f8b298 · 3f8b298
2 parents 6306c23 + beba965
commit 3f8b298
Show file tree

Hide file tree

Showing 13,601 changed files with 5,620,717 additions and 86,403 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@
 !.gitattributes
 !.dockerignore
 !.golangci.yml
+!.gcloudignore
 *.iml
 bin
 *.o

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -27,6 +27,8 @@ Participation in this project comes under the [Contributor Covenant Code of Cond
   "[kind/design](https://github.com/googleprivate/agones/issues?q=is%3Aissue+is%3Aopen+label%3Akind%2Fdesign)"
   outlining the feature that you wish to build, and describing how it will be implemented. This gives a chance
   for review to happen early, and ensures no wasted effort occurs.
+- For new features, documentation *must* be included. Review the [Documentation Editing and Contribution](https://agones.dev/site/docs/contribute/)
+  guide for details.
 - All submissions, including submissions by project members, will require review before being merged.
 - Once review has occurred, please rebase your PR down to a single commit. This will ensure a nice clean Git history.
 - Finally - *Thanks* for considering submitting code to Agones!