diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-07 00:11:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-07 00:11:54 +0000 |
| commit | ee14a276ab05e72f6dbf224ed5d85227f182984e (patch) | |
| tree | a3f083a34f8592e7c077b3cd9e34a97da46c2329 /maintainers | |
| parent | b308cfd396ae770999840273d4720129422a6cb9 (diff) | |
| parent | f32623b80922600a5703a83cb49c1252eed6361e (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 15 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
2 files changed, 14 insertions, 2 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 093755a13e8f9..4f0dc0531b2ff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2992,6 +2992,13 @@ githubId = 298705; name = "Cyril Cohen"; }; + colamaroro = { + name = "Corentin Rondier"; + email = "github@rondier.io"; + github = "colamaroro"; + githubId = 12484955; + matrix = "@colamaroro:lovelyrad.io"; + }; cole-h = { name = "Cole Helbling"; email = "cole.e.helbling@outlook.com"; @@ -4152,7 +4159,7 @@ }; dylanmtaylor = { email = "dylan@dylanmtaylor.com"; - github = "dylamtaylor"; + github = "dylanmtaylor"; githubId = 277927; name = "Dylan Taylor"; }; @@ -10567,6 +10574,12 @@ githubId = 772914; name = "Mikael Voss"; }; + mwdomino = { + email = "matt@dominey.io"; + github = "mwdomino"; + githubId = 46284538; + name = "Matt Dominey"; + }; mwolfe = { email = "corp@m0rg.dev"; github = "m0rg-dev"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9c2f4680d89c8..34f4576054ee8 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -288,7 +288,6 @@ with lib.maintainers; { golang = { members = [ - c00w kalbasit mic92 zowoq |