diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-30 18:01:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 18:01:33 +0000 |
| commit | 3c6eb8fe497b4a094c76fa05ead39234e7522f1e (patch) | |
| tree | 6bf41f67cb483db00b844061ff36b3926e384a06 /maintainers | |
| parent | 049a283a15f06790ce4332711e107dcaacbc2c28 (diff) | |
| parent | 0e99c6fbc699969b83e8c4deaedec6e1e4defe3f (diff) | |
| download | nixpkgs-3c6eb8fe497b4a094c76fa05ead39234e7522f1e.tar nixpkgs-3c6eb8fe497b4a094c76fa05ead39234e7522f1e.tar.gz nixpkgs-3c6eb8fe497b4a094c76fa05ead39234e7522f1e.tar.bz2 nixpkgs-3c6eb8fe497b4a094c76fa05ead39234e7522f1e.tar.lz nixpkgs-3c6eb8fe497b4a094c76fa05ead39234e7522f1e.tar.xz nixpkgs-3c6eb8fe497b4a094c76fa05ead39234e7522f1e.tar.zst nixpkgs-3c6eb8fe497b4a094c76fa05ead39234e7522f1e.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d5b09027026..8851889ef56 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8974,12 +8974,6 @@ githubId = 8641; name = "Pierre Carrier"; }; - pengmeiyu = { - email = "pengmyu@gmail.com"; - github = "pmeiyu"; - githubId = 8529551; - name = "Peng Mei Yu"; - }; penguwin = { email = "penguwin@penguwin.eu"; github = "penguwin"; @@ -9255,6 +9249,12 @@ githubId = 178496; name = "Philipp Middendorf"; }; + pmy = { + email = "pmy@xqzp.net"; + github = "pmeiyu"; + githubId = 8529551; + name = "Peng Mei Yu"; + }; pmyjavec = { email = "pauly@myjavec.com"; github = "pmyjavec"; |