diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-30 18:40:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 18:40:45 +0000 |
| commit | e75c8744cbcc437c40efadfe542b3c35206cdd7f (patch) | |
| tree | 00d3bc175b6e57c085faae4059dcd1857464db98 /maintainers | |
| parent | 099a83cabadf39515aec2ef3ea97472235958000 (diff) | |
| parent | bee02826b8bf0e9e5a8565e62f1329b49ab8539b (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4b2dc49147699..5ce46ff64365d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6441,6 +6441,16 @@ githubId = 1219785; name = "Félix Baylac-Jacqué"; }; + ninjin = { + email = "pontus@stenetorp.se"; + github = "ninjin"; + githubId = 354934; + name = "Pontus Stenetorp"; + keys = [{ + longkeyid = "rsa4096/0xD430287500E6483C"; + fingerprint = "0966 2F9F 3FDA C22B C22E 4CE1 D430 2875 00E6 483C"; + }]; + }; nioncode = { email = "nioncode+github@gmail.com"; github = "nioncode"; |