diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 22:11:42 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 22:11:42 -0700 |
| commit | 6b15fdce86eddd5d23ff448f6a7b50b319c5e686 (patch) | |
| tree | 22d541647a440d8fbaabc0ec869a551ce02ff671 /maintainers/maintainer-list.nix | |
| parent | 34a05e29f119bf06fe218b761b3999e4c7a87e65 (diff) | |
| parent | 788deaad9dbc27b94c0d930b617f659e71ea7987 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -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 1f3f409c808c7..cfd8a8918dbbc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6104,6 +6104,12 @@ githubId = 2914269; name = "Malo Bourgon"; }; + malvo = { + email = "malte@malvo.org"; + github = "malte-v"; + githubId = 34393802; + name = "Malte Voos"; + }; malyn = { email = "malyn@strangeGizmo.com"; github = "malyn"; @@ -11491,6 +11497,12 @@ fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; }]; }; + zeri = { + name = "zeri"; + email = "68825133+zeri42@users.noreply.github.com"; + github = "zeri42"; + githubId = 68825133; + }; zseri = { name = "zseri"; email = "zseri.devel@ytrizja.de"; |