diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-27 18:01:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-27 18:01:05 +0000 |
commit | e3d20dfaa59f5fde6b277943b7bc080390627bfa (patch) | |
tree | 404869fa5ebdd1ad8859cafd378c8ef3221707c0 /maintainers | |
parent | 086c62dd5eab696e889d6fb87c3cc0d10ca00762 (diff) | |
parent | 5f6a4fb8a7974aacdacb0a11566b3a35376cca49 (diff) | |
download | nixpkgs-e3d20dfaa59f5fde6b277943b7bc080390627bfa.tar nixpkgs-e3d20dfaa59f5fde6b277943b7bc080390627bfa.tar.gz nixpkgs-e3d20dfaa59f5fde6b277943b7bc080390627bfa.tar.bz2 nixpkgs-e3d20dfaa59f5fde6b277943b7bc080390627bfa.tar.lz nixpkgs-e3d20dfaa59f5fde6b277943b7bc080390627bfa.tar.xz nixpkgs-e3d20dfaa59f5fde6b277943b7bc080390627bfa.tar.zst nixpkgs-e3d20dfaa59f5fde6b277943b7bc080390627bfa.zip |
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e72c07ac80e..d1f6dbdc9ae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9944,6 +9944,12 @@ fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; }]; }; + ppenguin = { + name = "Jeroen Versteeg"; + email = "hieronymusv@gmail.com"; + github = "ppenguin"; + githubId = 17690377; + }; ppom = { name = "Paco Pompeani"; email = "paco@ecomail.io"; |