Merge branch 'master' into contributing-conduct-meetings-etc

caniszczyk · web-flow · commit 654ac3ba7998 · 2018-03-08T10:45:43.000-08:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -48,7 +48,6 @@ We're trying very hard to keep the project lean and focused. We don't want it
 to do everything for everybody. This means that we might decide against
 incorporating a new feature.
 
-
 ### Conventions
 
 Fork the repo and make changes on your fork in a feature branch.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -0,0 +1,8 @@
+This meta-project is maintained by the union of MAINTAINERS for all OCI Projects [1].
+
+Other OCI Projects should list one maintainer per line, with a name, email address, and GitHub username:
+
+Random J Developer <random@developer.example.org> (@RandomJDeveloperExample)
+A. U. Thor <author@example.org> (@AUThorExample)
+
+[1]: https://github.com/opencontainers/

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +This meta-project is maintained by the union of MAINTAINERS for all OCI Projects [1].
++
 +Other OCI Projects should list one maintainer per line, with a name, email address, and GitHub username:
++
 +Random J Developer <[email protected]> (@RandomJDeveloperExample)
 +A. U. Thor <[email protected]> (@AUThorExample)
++
 +[1]: https://github.com/opencontainers/