diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
| commit | afabc4a15d5ba6631bd4d865b8be37fc67d52809 (patch) | |
| tree | 2342d9e8bd8b4cfbfee2b9a98c088df9f1c809ca /maintainers/maintainer-list.nix | |
| parent | 9a0c85ffc5aedc46b4d81f3b9fc22d7f488e3ff9 (diff) | |
| parent | 714e527a726c9613fca8e13586a1b19198d68d9b (diff) | |
| download | nixpkgs-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar nixpkgs-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.gz nixpkgs-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.bz2 nixpkgs-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.lz nixpkgs-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.xz nixpkgs-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.zst nixpkgs-afabc4a15d5ba6631bd4d865b8be37fc67d52809.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts: pkgs/development/libraries/SDL2/default.nix
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b5a8f0e9dcd..0f57b33e103 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14841,6 +14841,12 @@ githubId = 145816; name = "David McKay"; }; + rayslash = { + email = "stevemathewjoy@tutanota.com"; + github = "rayslash"; + githubId = 45141270; + name = "Steve Mathew Joy"; + }; razvan = { email = "razvan.panda@gmail.com"; github = "freeman42x"; |