diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-03 06:01:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-03 06:01:28 +0000 |
| commit | 7ec41836730f4344e835c1ca06e33d347ff017a6 (patch) | |
| tree | c348463f3dbaccc3397afa473ddbb83b7e3d9f16 /maintainers | |
| parent | a83c4dd1939293da6ba883d98764c9dc5f14ef74 (diff) | |
| parent | 809f15f2e7fd66c3d3ba6aabffa946fbd67f93fc (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -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 bf4e23a03b53b..19bc074f77eba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6557,6 +6557,12 @@ githubId = 6445082; name = "Joseph Lukasik"; }; + jhh = { + email = "jeff@j3ff.io"; + github = "jhh"; + githubId = 14412; + name = "Jeff Hutchison"; + }; jhhuh = { email = "jhhuh.note@gmail.com"; github = "jhhuh"; @@ -14367,6 +14373,7 @@ }; urandom = { email = "colin@urandom.co.uk"; + matrix = "@urandom0:matrix.org"; github = "urandom2"; githubId = 2526260; keys = [{ @@ -16020,4 +16027,10 @@ github = "wuyoli"; githubId = 104238274; }; + ziguana = { + name = "Zig Uana"; + email = "git@ziguana.dev"; + github = "ziguana"; + githubId = 45833444; + }; } |