diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-09 12:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 12:01:04 +0000 |
| commit | 2d73797da48f676717877fea6dfe4468f15d2413 (patch) | |
| tree | 209b8a7f85057517695cbbbf523a7102bf3538a9 /maintainers/maintainer-list.nix | |
| parent | d96b3a86e56291a57628bc3dc76be1ab086dc29e (diff) | |
| parent | 7f24be48bee10e83ce784e67e72b8924877cb921 (diff) | |
| download | nixpkgs-2d73797da48f676717877fea6dfe4468f15d2413.tar nixpkgs-2d73797da48f676717877fea6dfe4468f15d2413.tar.gz nixpkgs-2d73797da48f676717877fea6dfe4468f15d2413.tar.bz2 nixpkgs-2d73797da48f676717877fea6dfe4468f15d2413.tar.lz nixpkgs-2d73797da48f676717877fea6dfe4468f15d2413.tar.xz nixpkgs-2d73797da48f676717877fea6dfe4468f15d2413.tar.zst nixpkgs-2d73797da48f676717877fea6dfe4468f15d2413.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff9bb39b0d3..74a269dd1c7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5337,6 +5337,13 @@ fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; }]; }; + ericthemagician = { + email = "eric@ericyen.com"; + matrix = "@eric:jupiterbroadcasting.com"; + github = "EricTheMagician"; + githubId = 323436; + name = "Eric Yen"; + }; erikarvstedt = { email = "erik.arvstedt@gmail.com"; matrix = "@erikarvstedt:matrix.org"; @@ -19947,6 +19954,12 @@ github = "zmitchell"; githubId = 10246891; }; + znaniye = { + email = "zn4niye@proton.me"; + github = "znaniye"; + githubId = 134703788; + name = "Samuel Silva"; + }; znewman01 = { email = "znewman01@gmail.com"; github = "znewman01"; |