diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-19 01:18:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 01:18:25 +0000 |
| commit | e8a1f18e58cc0e075de9f583ae547799b39f7489 (patch) | |
| tree | 302b100cf3b232ea5fd16b04576999e6d892eaac /maintainers | |
| parent | 38553bd4923324ebd3c0d68eb53325588027bcb3 (diff) | |
| parent | 726c05e5a8bda34a0bca5a12d42614be73e7439a (diff) | |
Merge staging-next into staging
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bdaec6ce15df..055443cb221d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1699,16 +1699,6 @@ githubId = 46303707; name = "Christian Lütke-Stetzkamp"; }; - kampka = { - email = "christian@kampka.net"; - github = "kampka"; - githubId = 422412; - name = "Christian Kampka"; - keys = [{ - longkeyid = "ed25519/0x1CBE9645DD68E915"; - fingerprint = "F7FA 0BD0 8775 337C F6AB 4A14 1CBE 9645 DD68 E915"; - }]; - }; ckauhaus = { email = "kc@flyingcircus.io"; github = "ckauhaus"; @@ -4976,6 +4966,10 @@ github = "kyleondy"; githubId = 1640900; name = "Kyle Ondy"; + keys = [{ + longkeyid = "rsa4096/0xDB0E3C33491F91C9"; + fingerprint = "3C79 9D26 057B 64E6 D907 B0AC DB0E 3C33 491F 91C9"; + }]; }; kylesferrazza = { name = "Kyle Sferrazza"; @@ -9099,6 +9093,12 @@ githubId = 844343; name = "Thiago K. Okada"; }; + thibautmarty = { + email = "github@thibautmarty.fr"; + github = "ThibautMarty"; + githubId = 3268082; + name = "Thibaut Marty"; + }; thmzlt = { email = "git@thomazleite.com"; github = "thmzlt"; |