diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-08 12:01:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-08 12:01:37 +0000 |
| commit | 1b60238acd96038c0a52ee73c012194d506eb432 (patch) | |
| tree | 8d1bb3d0fa72f6cad063e7de94032f0cc4845097 /maintainers | |
| parent | 0d24f164c934cf7328b9e26c2da1836716d7e3c5 (diff) | |
| parent | 5f41d9525a9e6c6d665e8e7d172d5ebac6a60df1 (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 15 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 697cb475dc1bf..0ddf2fa033de6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1922,6 +1922,12 @@ githubId = 2506621; name = "Brayden Willenborg"; }; + brendanreis = { + email = "brendanreis@gmail.com"; + name = "Brendan Reis"; + github = "brendanreis"; + githubId = 10686906; + }; brian-dawn = { email = "brian.t.dawn@gmail.com"; github = "brian-dawn"; @@ -10181,6 +10187,15 @@ fingerprint = "F90F FD6D 585C 2BA1 F13D E8A9 7571 654C F88E 31C2"; }]; }; + oxapentane = { + email = "blame@oxapentane.com"; + github = "oxapentane"; + githubId = 1297357; + name = "Grigory Shipunov"; + keys = [{ + fingerprint = "DD09 98E6 CDF2 9453 7FC6 04F9 91FA 5E5B F9AA 901C"; + }]; + }; oxij = { email = "oxij@oxij.org"; github = "oxij"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index a8e66897a683c..35e184b43991e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -110,6 +110,7 @@ with lib.maintainers; { astro SuperSandro2000 revol-xut + oxapentane ]; scope = "Maintain packages used in the C3D2 hackspace"; shortName = "c3d2"; |