diff options
author | maralorn <mail@maralorn.de> | 2023-04-18 11:49:36 +0200 |
---|---|---|
committer | maralorn <mail@maralorn.de> | 2023-04-18 11:49:36 +0200 |
commit | cfb1a6d6dd7d7197c6849e87a16f50b27bc54ee4 (patch) | |
tree | 3e4757b061086eec68b62ef29c1a2c6cc55d9403 /maintainers | |
parent | 465fcdbc9fd308fc57c27ee9d9f5433f4dff6f5f (diff) | |
parent | d0f57e6196da594a18b6bfd490b5497f472c8117 (diff) | |
download | nixpkgs-cfb1a6d6dd7d7197c6849e87a16f50b27bc54ee4.tar nixpkgs-cfb1a6d6dd7d7197c6849e87a16f50b27bc54ee4.tar.gz nixpkgs-cfb1a6d6dd7d7197c6849e87a16f50b27bc54ee4.tar.bz2 nixpkgs-cfb1a6d6dd7d7197c6849e87a16f50b27bc54ee4.tar.lz nixpkgs-cfb1a6d6dd7d7197c6849e87a16f50b27bc54ee4.tar.xz nixpkgs-cfb1a6d6dd7d7197c6849e87a16f50b27bc54ee4.tar.zst nixpkgs-cfb1a6d6dd7d7197c6849e87a16f50b27bc54ee4.zip |
Merge branch 'master' into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f12c8f37496..de3166443c3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8135,6 +8135,12 @@ githubId = 843652; name = "Kim Burgess"; }; + kindrowboat = { + email = "hello@kindrobot.ca"; + github = "kindrowboat"; + githubId = 777773; + name = "Stef Dunlap"; + }; kini = { email = "keshav.kini@gmail.com"; github = "kini"; @@ -11436,6 +11442,15 @@ fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; }]; }; + oddlama = { + email = "oddlama@oddlama.org"; + github = "oddlama"; + githubId = 31919558; + name = "oddlama"; + keys = [{ + fingerprint = "680A A614 E988 DE3E 84E0 DEFA 503F 6C06 8410 4B0A"; + }]; + }; odi = { email = "oliver.dunkl@gmail.com"; github = "odi"; |