Merge pull request #356 from prometheus/repo_sync

beorn7 · web-flow · commit d2dd2882780b · 2020-06-23T22:28:54.000+02:00
Synchronize common files from prometheus/prometheus
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+## Prometheus Community Code of Conduct
+
+Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+## Prometheus Community Code of Conduct`
	`2`	`+`
	`3`	`+Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).`