diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
| commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
| tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /maintainers/maintainer-list.nix | |
| parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
| parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) | |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f2dc80c728125..5246afc99b9b4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8530,6 +8530,12 @@ githubId = 95194; name = "Mauricio Scheffer"; }; + maxhero = { + email = "contact@maxhero.dev"; + github = "themaxhero"; + githubId = 4708337; + name = "Marcelo A. de L. Santos"; + }; max-niederman = { email = "max@maxniederman.com"; github = "max-niederman"; @@ -12144,6 +12150,16 @@ githubId = 3598650; name = "Fritz Otlinghaus"; }; + Scrumplex = { + name = "Sefa Eyeoglu"; + email = "contact@scrumplex.net"; + matrix = "@Scrumplex:duckhub.io"; + github = "Scrumplex"; + githubId = 11587657; + keys = [{ + fingerprint = "AF1F B107 E188 CB97 9A94 FD7F C104 1129 4912 A422"; + }]; + }; scubed2 = { email = "scubed2@gmail.com"; github = "scubed2"; |