diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-16 18:01:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-16 18:01:17 +0000 |
| commit | dba5c9ef4ed32157e57d2e00ab19be3263cc63c9 (patch) | |
| tree | 6446ece865f4a4d4a6d03ab688e853831eb8a9c4 /maintainers/maintainer-list.nix | |
| parent | 301fcc69ba3bc67deb1754ecd61fdba6ba50a2b4 (diff) | |
| parent | cd1338d66652a9606ac4e3c99996c8957e642dcc (diff) | |
| download | nixpkgs-dba5c9ef4ed32157e57d2e00ab19be3263cc63c9.tar nixpkgs-dba5c9ef4ed32157e57d2e00ab19be3263cc63c9.tar.gz nixpkgs-dba5c9ef4ed32157e57d2e00ab19be3263cc63c9.tar.bz2 nixpkgs-dba5c9ef4ed32157e57d2e00ab19be3263cc63c9.tar.lz nixpkgs-dba5c9ef4ed32157e57d2e00ab19be3263cc63c9.tar.xz nixpkgs-dba5c9ef4ed32157e57d2e00ab19be3263cc63c9.tar.zst nixpkgs-dba5c9ef4ed32157e57d2e00ab19be3263cc63c9.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -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 0021471e320..25ca241f348 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8295,6 +8295,15 @@ githubId = 18501; name = "Julien Langlois"; }; + jfly = { + name = "Jeremy Fleischman"; + email = "jeremyfleischman@gmail.com"; + github = "jfly"; + githubId = 277474; + keys = [{ + fingerprint = "F1F1 3395 8E8E 9CC4 D9FC 9647 1931 9CD8 416A 642B"; + }]; + }; jfrankenau = { email = "johannes@frankenau.net"; github = "jfrankenau"; @@ -11209,6 +11218,12 @@ githubId = 11810057; name = "Matt Snider"; }; + matusf = { + email = "matus.ferech@gmail.com"; + github = "matusf"; + githubId = 18228995; + name = "Matúš Ferech"; + }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; |