diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-30 00:53:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 00:53:01 +0000 |
| commit | 31fc47581244ce947c2e91f817bc823c000c4c35 (patch) | |
| tree | 6ab88f3910267be47527308aa776dfef21f0f00a /maintainers | |
| parent | ff873c7c213c0ab112a60b151a12261bbb40a585 (diff) | |
| parent | 3c08a64b7dc4bf94a4e83dd0eac3253138ccfaea (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 93c6422744f97..4b2dc49147699 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2867,6 +2867,12 @@ githubId = 30512529; name = "Evils"; }; + ewok = { + email = "ewok@ewok.ru"; + github = "ewok"; + githubId = 454695; + name = "Artur Taranchiev"; + }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; @@ -5919,6 +5925,12 @@ githubId = 1001112; name = "Marcin Janczyk"; }; + mjlbach = { + email = "m.j.lbach@gmail.com"; + github = "mjlbach"; + githubId = 13316262; + name = "Michael Lingelbach"; + }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; |