diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-25 01:18:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-25 01:18:25 +0000 |
commit | b10ed56b8e950d57b2f4d9c2a2f21b61416065a4 (patch) | |
tree | b1cb1628f51986e00a35e15f543aed944a541b52 /maintainers | |
parent | cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d (diff) | |
parent | b8217bb14abbfa44d19afa1706f6e041114eccbc (diff) |
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e8bc91ca1cb0..a8091dd7ee0a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2589,6 +2589,12 @@ githubId = 119483; name = "Matthew Brown"; }; + eduardosm = { + email = "esm@eduardosm.net"; + github = "eduardosm"; + githubId = 761151; + name = "Eduardo Sánchez Muñoz"; + }; eduarrrd = { email = "e.bachmakov@gmail.com"; github = "eduarrrd"; @@ -3711,6 +3717,12 @@ githubId = 362833; name = "Hongchang Wu"; }; + hoverbear = { + email = "operator+nix@hoverbear.org"; + github = "hoverbear"; + githubId = 130903; + name = "Ana Hobden"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; @@ -6727,6 +6739,12 @@ githubId = 7677321; name = "Paul Trehiou"; }; + nyanotech = { + name = "nyanotech"; + email = "nyanotechnology@gmail.com"; + github = "nyanotech"; + githubId = 33802077; + }; nyarly = { email = "nyarly@gmail.com"; github = "nyarly"; |