Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/nodejs/node into nodeDocs
Browse files Browse the repository at this point in the history
  • Loading branch information
vipul kumar committed Sep 3, 2021
2 parents 3a23620 + c68faa9 commit b8b8401
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ env:
jobs:
build-windows:
if: github.event.pull_request.draft == false
strategy:
matrix:
windows: [windows-2019, windows-2022]
fail-fast: false
runs-on: ${{ matrix.windows }}
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ env.PYTHON_VERSION }}
Expand Down
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ Nebu Pookins <nebu@nebupookins.net>
Netto Farah <nettofarah@gmail.com>
Nicholas Kinsey <pyrotechnick@feistystudios.com>
Nick Soggin <nicksoggin@gmail.com> <iSkore@users.noreply.github.com>
Nigel Kibodeaux <nigelmail@gmail.com> <nigel@team.about.me>
Nikola Glavina <glavina.nikola5@gmail.com> <nikola.glavina@student.um.si>
Nikolai Vavilov <vvnicholas@gmail.com>
Nils Kuhnhenn <lain@volafile.io>
Expand Down
3 changes: 1 addition & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,7 @@ Dan Villa <danielavilla02@gmail.com>
CodeTheInternet <edlerner+github@protonmail.com>
Eric Gonzalez <ericxgonzalez@gmail.com>
rgoodwin <rjngoodwin@gmial.com>
Nigel Kibodeaux <nigel@team.about.me>
Nigel Kibodeaux <nigelmail@gmail.com>
fmizzell <fmizzell@1312210.no-reply.drupal.org>
cdnadmin <cdnadmin@collaborare.net>
Paul Lucas <pjl.paul@gmail.com>
Expand Down Expand Up @@ -1772,7 +1772,6 @@ Guilherme Akio Sakae <akio.xd@gmail.com>
Martin Michaelis <code@mgjm.de>
Christopher Sidebottom <chris@damouse.co.uk>
Edward Andrew Robinson <earobinson@gmail.com>
Nigel Kibodeaux <nigelmail@gmail.com>
Shakeel Mohamed <contact@shakeel.xyz>
Tobias Kieslich <tobias.kieslich@gmail.com>
Ruy Adorno <ruyadorno@hotmail.com>
Expand Down

0 comments on commit b8b8401

Please sign in to comment.