diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-11 12:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 12:00:58 +0000 |
| commit | 652204165dd39420b8662b82d311e511b3ec0d99 (patch) | |
| tree | a3d500109f20eb84d5327d7746811c94f124a3b2 /maintainers | |
| parent | 49ab0c849ed774db4af45b83552a60d24c6966a0 (diff) | |
| parent | 51c7e38b94873aa240803c5c29add72d18a57514 (diff) | |
| download | nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.gz nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.bz2 nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.lz nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.xz nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.tar.zst nixpkgs-652204165dd39420b8662b82d311e511b3ec0d99.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0f57b33e103..7c1d6d5ed9e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12868,13 +12868,6 @@ fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28"; }]; }; - ninjatrappeur = { - email = "felix@alternativebit.fr"; - matrix = "@ninjatrappeur:matrix.org"; - github = "NinjaTrappeur"; - githubId = 1219785; - name = "Félix Baylac-Jacqué"; - }; nintron = { email = "nintron@sent.com"; github = "Nintron27"; @@ -13979,6 +13972,13 @@ githubId = 627831; name = "Hoang Xuan Phu"; }; + picnoir = { + email = "felix@alternativebit.fr"; + matrix = "@picnoir:alternativebit.fr"; + github = "picnoir"; + githubId = 1219785; + name = "Félix Baylac-Jacqué"; + }; piegames = { name = "piegames"; email = "nix@piegames.de"; |