diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-16 18:04:45 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-16 18:04:45 +0000 |
commit | 2d104c99a7d99ead0a9eeb74f1f523aa77aae743 (patch) | |
tree | b2f54bf05c3927f0426ede6367b7f094e3dc10c3 /maintainers | |
parent | b08ae54dd9daf4cceb03d49d681bfbd7ad013bb8 (diff) | |
parent | d86f21194aed2b84256509d05f0a527a8c063229 (diff) |
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bc349cd9d5072..931fb11a08db6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7281,6 +7281,11 @@ githubId = 628342; name = "Tim Steinbach"; }; + nessdoor = { + name = "Tomas Antonio Lopez"; + email = "entropy.overseer@protonmail.com"; + githubId = 25993494; + }; netcrns = { email = "jason.wing@gmx.de"; github = "netcrns"; |