diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-01 00:06:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 00:06:16 +0000 |
| commit | 61c79ee0586bddb55d5cd7127a943c9b91fd5bab (patch) | |
| tree | ce7339e771ca12fcc7dd8e25ae7fc1075efe5683 /maintainers | |
| parent | df8f2736d54dfc8eac8f648b05f87b5eac2c1241 (diff) | |
| parent | 0293e3e473477f261aaef4a4f87c2deb36763570 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d2519d68fb576..99bddfb36e161 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1701,6 +1701,18 @@ githubId = 3471749; name = "Claudio Bley"; }; + cburstedde = { + email = "burstedde@ins.uni-bonn.de"; + github = "cburstedde"; + githubId = 109908; + name = "Carsten Burstedde"; + keys = [ + { + longkeyid = "rsa2048/0x0704CD9E550A6BCD"; + fingerprint = "1127 A432 6524 BF02 737B 544E 0704 CD9E 550A 6BCD"; + } + ]; + }; cdepillabout = { email = "cdep.illabout@gmail.com"; github = "cdepillabout"; @@ -2562,7 +2574,7 @@ name = "Diego Lelis"; }; diffumist = { - email = "diffumist@gmail.com"; + email = "git@diffumist.me"; github = "diffumist"; githubId = 32810399; name = "Diffumist"; @@ -7228,10 +7240,10 @@ name = "Marko Poikonen"; }; mtreca = { - email = "maxime@treca.dev"; - name = "Maxime Tréca"; + email = "maxime.treca@gmail.com"; github = "mtreca"; githubId = 16440823; + name = "Maxime Tréca"; }; mtreskin = { email = "zerthurd@gmail.com"; @@ -8120,6 +8132,12 @@ githubId = 1640697; name = "Philipp Hausmann"; }; + Philipp-M = { + email = "philipp@mildenberger.me"; + github = "Philipp-M"; + githubId = 9267430; + name = "Philipp Mildenberger"; + }; Phlogistique = { email = "noe.rubinstein@gmail.com"; github = "Phlogistique"; @@ -10866,6 +10884,12 @@ githubId = 608417; name = "Jos van den Oever"; }; + vanilla = { + email = "neko@hydev.org"; + github = "VergeDX"; + githubId = 25173827; + name = "Vanilla"; + }; vanschelven = { email = "klaas@vanschelven.com"; github = "vanschelven"; |