diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-22 12:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-22 12:01:16 +0000 |
| commit | 6859dda947dbdb5b52f4053a4bf9791e69f6c9eb (patch) | |
| tree | d56c8aecae0c3aaa441ac79f18aaa1830b72e943 /maintainers | |
| parent | 205550361751469660155c0b7bcfbd68ff68acb3 (diff) | |
| parent | 3eccda7f1a5b134e52d8fb7c1710ddb0879636c5 (diff) | |
| download | nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.gz nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.bz2 nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.lz nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.xz nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.tar.zst nixlib-6859dda947dbdb5b52f4053a4bf9791e69f6c9eb.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5da600c84d2b..4d25885ed732 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13961,6 +13961,12 @@ github = "p3psi-boo"; githubId = 43925055; }; + pabloaul = { + email = "contact@nojus.org"; + github = "pabloaul"; + githubId = 35423980; + name = "Nojus Dulskis"; + }; pablovsky = { email = "dealberapablo07@gmail.com"; github = "Pablo1107"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0f0485a55bba..c80055f254fe 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -319,6 +319,7 @@ with lib.maintainers; { imincik nh2 nialov + r-burns sikmir willcohen ]; |