diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-10 00:14:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-10 00:14:11 +0000 |
| commit | bf7ad8aa57dbad64a1cb2cb7462c8d364f9f867b (patch) | |
| tree | 8993501cbd14eaf252a19370b87319cf9185adea /maintainers | |
| parent | 4bda2ab514930534471d9c1d814c4ece3aa942bc (diff) | |
| parent | 9ced5bc0e7fea9a35ab59616bc8dc25708bbf80a (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 659d7ad3b8f52..34d7aa4c4f931 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8948,7 +8948,8 @@ githubId = 13547699; name = "Corin Hoad"; keys = [{ - fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; + # fingerprint = "BA3A 5886 AE6D 526E 20B4 57D6 6A37 DF94 8318 8492"; # old key, superseded + fingerprint = "6E69 6A19 4BD8 BFAE 7362 ACDB 6437 4619 95CA 7F16"; }]; }; lux = { @@ -9270,6 +9271,12 @@ githubId = 854770; name = "Matej Cotman"; }; + mateodd25 = { + email = "mateodd@icloud.com"; + github = "mateodd25"; + githubId = 854770; + name = "Mateo Diaz"; + }; mathnerd314 = { email = "mathnerd314.gph+hs@gmail.com"; github = "Mathnerd314"; @@ -10722,12 +10729,6 @@ fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; }]; }; - nichtsfrei = { - email = "philipp.eder@posteo.net"; - github = "nichtsfrei"; - githubId = 1665818; - name = "Philipp Eder"; - }; nickcao = { name = "Nick Cao"; email = "nickcao@nichi.co"; |