diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-12 00:01:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 00:01:49 +0000 |
| commit | be8c1707399fb5d8b5de0531d09661eded9cf0a1 (patch) | |
| tree | e415b55376b6c4ee521da33defc77896ff0f53c3 /maintainers/maintainer-list.nix | |
| parent | 7573d7fe79dff36b24606e695a935ce7f1337b4a (diff) | |
| parent | 14260bb7ba68fd8c7cc088b71d9ae947bdba4c10 (diff) | |
| download | nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.gz nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.bz2 nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.lz nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.xz nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.tar.zst nixlib-be8c1707399fb5d8b5de0531d09661eded9cf0a1.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 077381e8d30b..f141a9b06b66 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2181,6 +2181,12 @@ githubId = 42220376; name = "Charlotte Van Petegem"; }; + cigrainger = { + name = "Christopher Grainger"; + email = "chris@amplified.ai"; + github = "cigrainger"; + githubId = 3984794; + }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; @@ -11676,6 +11682,17 @@ githubId = 55607356; name = "Stephan Heßelmann"; }; + steinybot = { + name = "Jason Pickens"; + email = "jasonpickensnz@gmail.com"; + matrix = "@steinybot:matrix.org"; + github = "steinybot"; + githubId = 4659562; + keys = [{ + longkeyid = "ed25519/0x21DE1CAE59762A0F"; + fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; + }]; + }; stelcodes = { email = "stel@stel.codes"; github = "stelcodes"; |