diff options
| author | maralorn <mail@maralorn.de> | 2023-04-28 13:26:27 +0200 |
|---|---|---|
| committer | maralorn <mail@maralorn.de> | 2023-04-28 13:26:27 +0200 |
| commit | bde63d834b3d3627095d00b6db1e9a5049ce4dd9 (patch) | |
| tree | 0767cc79a032ec725bd8e90207de83d966972a8c /maintainers | |
| parent | 64ebcd8051eeb7800f66a2bf473d687748c0bc89 (diff) | |
| parent | 3b2220d44874e8802e4228ab25c74e20d9441072 (diff) | |
Merge branch 'master' into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c6fd1752481ec..a65241ee86daa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14840,10 +14840,12 @@ name = "Stijn DW"; }; StillerHarpo = { - email = "florianengel39@gmail.com"; + email = "engelflorian@posteo.de"; github = "StillerHarpo"; githubId = 25526706; name = "Florian Engel"; + keys = [{ fingerprint = "4E2D9B26940E0DABF376B7AF76762421D45837DE"; }]; + matrix = "@qe7ftcyrpg:matrix.org"; }; stites = { email = "sam@stites.io"; @@ -15265,6 +15267,12 @@ githubId = 1755789; name = "Robert Irelan"; }; + tennox = { + email = "tennox+nix@txlab.io"; + github = "tennox"; + githubId = 2084639; + name = "Manu"; + }; teozkr = { email = "teo@nullable.se"; github = "nightkr"; |