diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-07 19:52:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-07 19:52:18 +0000 |
| commit | 182718fecc3b6c35419ee0d085a87b579c4965f8 (patch) | |
| tree | 3932c5f76c0c4a1c1cd7b093bad530707d1938d1 /maintainers/maintainer-list.nix | |
| parent | f33fceca13083254086639741c2bd52b51e45bcb (diff) | |
| parent | 4309990c6fffe6c810d6aba0b12ecb350970f0c4 (diff) | |
| download | nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.gz nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.bz2 nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.lz nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.xz nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.tar.zst nixpkgs-182718fecc3b6c35419ee0d085a87b579c4965f8.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/top-level/linux-kernels.nix
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a1c3ab6890f..91f9454a437 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6071,6 +6071,15 @@ githubId = 12715461; name = "Anders Bo Rasmussen"; }; + fwam = { + name = "Legion Orsetti"; + email = "fwam@queereen.dev"; + github = "fwam"; + githubId = 113541944; + keys = [{ + fingerprint = "3822 20B8 57ED 0602 3786 8A7A 18E1 AE22 D704 B4FC"; + }]; + }; fwc = { github = "fwc"; githubId = 29337229; |