diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-01 06:22:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-01 06:22:40 +0000 |
| commit | 8500f595a18fefbc3791aeb9709750e5f6775030 (patch) | |
| tree | 339931c3c294b776a1f5b97bb47b080c9624f357 /maintainers | |
| parent | 999c670119eee8017d2de703e766e6c9ed8527d7 (diff) | |
| parent | 299c95ac165e9e4c5e55788e02031a155e8f7723 (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ce4a83b70a0f7..c122623a63017 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3619,6 +3619,12 @@ email = "t@larkery.com"; name = "Tom Hinton"; }; + hirenashah = { + email = "hiren@hiren.io"; + github = "hirenashah"; + githubId = 19825977; + name = "Hiren Shah"; + }; hjones2199 = { email = "hjones2199@gmail.com"; github = "hjones2199"; @@ -3935,6 +3941,12 @@ githubId = 2179419; name = "Arseniy Seroka"; }; + jakeisnt = { + name = "Jacob Chvatal"; + email = "jake@isnt.online"; + github = "jakeisnt"; + githubId = 29869612; + }; jakelogemann = { email = "jake.logemann@gmail.com"; github = "jakelogemann"; @@ -9414,6 +9426,12 @@ fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742"; }]; }; + vel = { + email = "llathasa@outlook.com"; + github = "llathasa-veleth"; + githubId = 61933599; + name = "vel"; + }; velovix = { email = "xaviosx@gmail.com"; github = "velovix"; |