summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2022-12-05 13:59:22 +0100
committerPierre Sassoulas <pierre.sassoulas@gmail.com>2022-12-05 13:59:22 +0100
commit94ff90f9cbacc910c83d0d7eddbba62c1df67a0a (patch)
tree0318a6aeb8d2aee7c98d056c350ce91162505254 /script
parent1913635db913e97f8866bb7e6e3dc1ca993f5a24 (diff)
parent1f84ed912d088a9c2152ad7bc9b1aff0a66f389f (diff)
downloadpylint-git-94ff90f9cbacc910c83d0d7eddbba62c1df67a0a.tar.gz
Merge 'maintenance/2.15.x' into main following 2.15.8 release
Diffstat (limited to 'script')
-rw-r--r--script/.contributors_aliases.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/script/.contributors_aliases.json b/script/.contributors_aliases.json
index 44ca36e20..3adba8f78 100644
--- a/script/.contributors_aliases.json
+++ b/script/.contributors_aliases.json
@@ -185,7 +185,8 @@
"bot@noreply.github.com": {
"mails": [
"66853113+pre-commit-ci[bot]@users.noreply.github.com",
- "49699333+dependabot[bot]@users.noreply.github.com"
+ "49699333+dependabot[bot]@users.noreply.github.com",
+ "41898282+github-actions[bot]@users.noreply.github.com"
],
"name": "bot"
},