diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
commit | 595a72589f038e4512ca12232009c97a47fba044 (patch) | |
tree | 079cdeab0e7722d19292fb7532adc42d77533d1f /maintainers | |
parent | f9e17ca3f68b040bd0cf68c26104e4a5c9bc7b4f (diff) | |
parent | 62dc989963c67fe5564b30a2b4bf21ba49446eee (diff) |
Merge master into staging
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 87d482a160faf..89ea065f024c2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -72,6 +72,11 @@ github = "FireyFly"; name = "Jonas Höglund"; }; + Fresheyeball = { + email = "fresheyeball@gmail.com"; + github = "fresheyeball"; + name = "Isaac Shapira"; + }; Gonzih = { email = "gonzih@gmail.com"; github = "Gonzih"; @@ -512,6 +517,11 @@ email = "sivaraman.balaji@gmail.com"; name = "Balaji Sivaraman"; }; + bandresen = { + email = "bandresen@gmail.com"; + github = "bandresen"; + name = "Benjamin Andresen"; + }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; @@ -1181,6 +1191,11 @@ github = "ellis"; name = "Ellis Whitehead"; }; + elvishjerricco = { + email = "elvishjerricco@gmail.com"; + github = "ElvishJerricco"; + name = "Will Fancher"; + }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; |