diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-24 06:01:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 06:01:18 +0000 |
| commit | b261cac75a98829556226310ef5e9fe9a0e145d6 (patch) | |
| tree | e35afda60973c7c68a3198b2c33574b14eef2fbd /maintainers | |
| parent | 1ab8a4f45be45efbd54e0b9d32ba396c9ec4e7ef (diff) | |
| parent | 0285ef2f742163913ce8c6cee2ba635bc17e1e5c (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 966ed4197e5bf..e7f1d653e426d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4573,6 +4573,12 @@ githubId = 343415; name = "Greg Roodt"; }; + gruve-p = { + email = "groestlcoin@gmail.com"; + github = "gruve-p"; + githubId = 11212268; + name = "gruve-p"; + }; gschwartz = { email = "gsch@pennmedicine.upenn.edu"; github = "GregorySchwartz"; @@ -11036,7 +11042,7 @@ name = "Yann Hodique"; }; sikmir = { - email = "sikmir@gmail.com"; + email = "sikmir@disroot.org"; github = "sikmir"; githubId = 688044; name = "Nikolay Korotkiy"; |