summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2022-10-10 15:17:59 +0200
committerPierre Sassoulas <pierre.sassoulas@gmail.com>2022-10-10 15:21:12 +0200
commite5a42200ad78d35e4250201296ae27fb7a276673 (patch)
tree6215b47c9c301d16dcac39be7a2e8571b2dce31f /script
parent1f75fc99c8613da028cc4c98be734a6ca3f658ee (diff)
parent20af036e38c8cb8c16df4a12307319d6df4bee54 (diff)
downloadpylint-git-e5a42200ad78d35e4250201296ae27fb7a276673.tar.gz
Merge branch 'maintenance/2.15.x' into following 2.15.4 release
Diffstat (limited to 'script')
-rw-r--r--script/.contributors_aliases.json26
1 files changed, 19 insertions, 7 deletions
diff --git a/script/.contributors_aliases.json b/script/.contributors_aliases.json
index 2864e0830..95808f651 100644
--- a/script/.contributors_aliases.json
+++ b/script/.contributors_aliases.json
@@ -98,10 +98,6 @@
"mails": ["95424144+allanc65@users.noreply.github.com"],
"name": "Allan Chandler"
},
- "<awilliam@redhat.com>": {
- "mails": ["awilliam@redhat.com", "adam@blueradius.ca"],
- "name": "Adam Williamson"
- },
"Adrien.DiMascio@logilab.fr": {
"mails": ["Adrien.DiMascio@logilab.fr"],
"name": "Adrien Di Mascio"
@@ -134,6 +130,10 @@
"mails": ["alexandre.fayolle@logilab.fr", "afayolle.ml@free.fr"],
"name": "Alexandre Fayolle"
},
+ "alvaro.frias@eclypsium.com": {
+ "mails": ["alvaro.frias@eclypsium.com"],
+ "name": "Alvaro Frias Garay"
+ },
"anjsimmo@gmail.com": {
"mails": ["anjsimmo@gmail.com", "a.simmons@deakin.edu.au"],
"name": "Andrew J. Simmons"
@@ -162,6 +162,10 @@
"name": "Ashley Whetter",
"team": "Maintainers"
},
+ "awilliam@redhat.com": {
+ "mails": ["awilliam@redhat.com", "adam@blueradius.ca"],
+ "name": "Adam Williamson"
+ },
"balint.mihai@gmail.com": {
"mails": ["balint.mihai@gmail.com", "mihai@cs.upt.ro"],
"name": "Mihai Balint"
@@ -432,6 +436,10 @@
"name": "Matus Valo",
"team": "Maintainers"
},
+ "me@daogilvie.com": {
+ "mails": ["me@daogilvie.com", "drum.ogilvie@ovo.com"],
+ "name": "Drummond Ogilvie"
+ },
"me@the-compiler.org": {
"mails": [
"me@the-compiler.org",
@@ -521,6 +529,10 @@
"mails": ["ruro.ruro@ya.ru"],
"name": "Ruro"
},
+ "sandro.tosi@gmail.com": {
+ "mails": ["sandro.tosi@gmail.com", "sandrotosi@users.noreply.github.com"],
+ "name": "Sandro Tosi"
+ },
"sergeykosarchuk@gmail.com": {
"mails": ["sergeykosarchuk@gmail.com"],
"name": "Kosarchuk Sergey"
@@ -583,8 +595,8 @@
"mails": ["vladtemian@gmail.com"],
"name": "Vlad Temian"
},
- "alvaro.frias@eclypsium.com": {
- "mails": ["alvaro.frias@eclypsium.com"],
- "name": "Alvaro Frias Garay"
+ "yileiyang@google.com": {
+ "mails": ["yileiyang@google.com"],
+ "name": "Yilei \"Dolee\" Yang"
}
}