Skip to content

Commit 7a512ad

Browse files
author
Andy Hanson
committed
Merge branch 'master' into unique_declarations
2 parents b4eaf9d + fe8f239 commit 7a512ad

File tree

224 files changed

+7487
-3081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+7487
-3081
lines changed

‎.mailmap

+6-1
Original file line numberDiff line numberDiff line change
@@ -316,4 +316,9 @@ Adnan Chowdhury <bttf@users.noreply.github.com>
316316
Esakki Raj <esakkiraj.tce@gmail.com>
317317
Jack Williams <jw@jackw.io>
318318
Philippe Voinov <philippevoinov@gmail.com>
319-
Stephan Ginthör <26004708+Lazarus535@users.noreply.github.com>
319+
Stephan Ginthör <26004708+Lazarus535@users.noreply.github.com>
320+
AdityaDaflapurkar <adaflapurkar@gmail.com> # Aditya Daflapurkar
321+
Eric Grube <grubee79@gmail.com>
322+
Martyn Janes <martyn@obany.com>
323+
Ricardo N Feliciano <FelicianoTech@gmail.com>
324+
Sergii Bezliudnyi <serg.bezludny@gmail.com>

‎AUTHORS.md

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TypeScript is authored by:
33
* Abubaker Bashir
44
* Adam Freidin
55
* Adi Dahiya
6+
* Aditya Daflapurkar
67
* Adnan Chowdhury
78
* Adrian Leonhard
89
* Ahmad Farid
@@ -85,6 +86,7 @@ TypeScript is authored by:
8586
* @e-cloud
8687
* Elisée Maurer
8788
* Emilio García-Pumarino
89+
* Eric Grube
8890
* Eric Tsang
8991
* Erik Edrosa
9092
* Erik McClenney
@@ -184,6 +186,7 @@ TypeScript is authored by:
184186
* Marius Schulz
185187
* Martin Hiller
186188
* Martin Vseticka
189+
* Martyn Janes
187190
* Masahiro Wakame
188191
* Matt Bierner
189192
* Matt McCutchen
@@ -237,6 +240,7 @@ TypeScript is authored by:
237240
* Raj Dosanjh
238241
* Reiner Dolp
239242
* Remo H. Jansen
243+
* Ricardo N Feliciano
240244
* Richard Karmazín
241245
* Richard Knoll
242246
* Richard Sentino
@@ -252,6 +256,7 @@ TypeScript is authored by:
252256
* Sean Barag
253257
* Sergey Rubanov
254258
* Sergey Shandar
259+
* Sergii Bezliudnyi
255260
* Sharon Rolel
256261
* Sheetal Nandi
257262
* Shengping Zhong

0 commit comments

Comments
 (0)