Merge branch 'master' into init

nodejs · Jul 18, 2020 · 2a43a02 · 2a43a02
2 parents a720c7a + 026728c
commit 2a43a02
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,11 +4,6 @@ the requirements below.
 
 -->
 
-##### Checklist
-<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
-
-- [ ] commit message follows [commit guidelines]
-
 <!--
 Developer's Certificate of Origin 1.1
 

diff --git a/AUTHORS b/AUTHORS
diff --git a/LICENSE b/LICENSE
@@ -1,13 +1,10 @@
-The MIT License (MIT)
-=====================
+MIT License
 
-Copyright (c) 2020 ci-travis-config contributors
---------------------------------------------------
+Copyright (c) 2020 Contributors https://github.com/nodejs/ci-config-travis/graphs/contributors
 
-*ci-config-travis contributors listed at <https://github.com/nodejs/ci-config-travis/blob/master/AUTHORS>*
-
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 - Read more about [Shared Build Configurations in Travis CI](https://docs.travis-ci.com/user/build-config-imports/).
 
 ## Usage
+This repository is managed by the [Package Maintenance Working Group](https://github.com/nodejs/package-maintenance), see [Governance](https://github.com/nodejs/package-maintenance/blob/master/Governance.md).
 
 Replace the list of `node_js` versions in your `.travis.yml` with one of the available files.