diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-07-18 08:29:53 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-07-18 08:29:53 +0200 |
commit | 250922fd1e061f2132d33b778424f4e9ed42354a (patch) | |
tree | c26970f54a01d8d612c82818de8d2104172b9fa0 /maintainers/maintainer-list.nix | |
parent | 0ff0b14968e7474fbb917fbb096a8d89d121922f (diff) | |
parent | 950a258b9ef24ca4346bbf722a694c2ab54e4654 (diff) | |
download | nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.gz nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.bz2 nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.lz nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.xz nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.zst nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
-rw-r--r-- | maintainers/maintainer-list.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 40c834d9751..1a0b2ab335a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -893,6 +893,13 @@ githubId = 661909; name = "Antonio Nuno Monteiro"; }; + anoa = { + matrix = "@andrewm:amorgan.xyz"; + email = "andrew@amorgan.xyz"; + github = "anoadragon453"; + githubId = 1342360; + name = "Andrew Morgan"; + }; anpryl = { email = "anpryl@gmail.com"; github = "anpryl"; @@ -5405,6 +5412,13 @@ githubId = 40234257; name = "ilkecan bozdogan"; }; + ihatethefrench = { + email = "michal@tar.black"; + matrix = "@michal:tar.black"; + github = "ihatethefrench"; + githubId = 30374463; + name = "Michal S."; + }; illegalprime = { email = "themichaeleden@gmail.com"; github = "illegalprime"; |