diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-09 00:12:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 00:12:27 +0000 |
| commit | f3e8efda4999ec23591970527a140bd08d4782ba (patch) | |
| tree | e69dd32fde20a0b642e18d419716d19d0e2eadd5 /maintainers | |
| parent | fe1578be1ea7e20496a56ca567c7c8d83861effc (diff) | |
| parent | 1e45a2364239087f7fae9a0dcc97cbdd29aabc78 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 85a1d4c523649..0c326c9bbf7a0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7998,6 +7998,12 @@ githubId = 488556; name = "Javier Aguirre"; }; + javimerino = { + email = "merino.jav@gmail.com"; + name = "Javi Merino"; + github = "JaviMerino"; + githubId = 44926; + }; jayesh-bhoot = { name = "Jayesh Bhoot"; email = "jb@jayeshbhoot.com"; @@ -14623,7 +14629,7 @@ }; quantenzitrone = { email = "quantenzitrone@protonmail.com"; - github = "Quantenzitrone"; + github = "quantenzitrone"; githubId = 74491719; matrix = "@quantenzitrone:matrix.org"; name = "quantenzitrone"; @@ -19078,6 +19084,12 @@ fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; }]; }; + whiteley = { + email = "mattwhiteley@gmail.com"; + github = "whiteley"; + githubId = 2215; + name = "Matt Whiteley"; + }; WhittlesJr = { email = "alex.joseph.whitt@gmail.com"; github = "WhittlesJr"; @@ -19381,11 +19393,11 @@ name = "Uli Baum"; }; xfix = { - email = "konrad@borowski.pw"; + email = "kamila@borowska.pw"; matrix = "@xfix:matrix.org"; github = "xfix"; githubId = 1297598; - name = "Konrad Borowski"; + name = "Kamila Borowska"; }; xfnw = { email = "xfnw+nixos@riseup.net"; |