diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-05 01:07:22 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-11-05 01:07:22 +0100 |
| commit | 8dca8b9ccb05e7abe6b769485a4d224987c15c06 (patch) | |
| tree | 80f8e212628d458ecc6d9e9af22661813eed8aa7 /maintainers | |
| parent | 1ba64dad7c7b29a03ace672b2ff1a01343e853fe (diff) | |
| parent | 22906321fbc0d38372d7ae2657adb2597fc384c1 (diff) | |
| download | nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.gz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.bz2 nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.lz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.xz nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.tar.zst nixpkgs-8dca8b9ccb05e7abe6b769485a4d224987c15c06.zip | |
Merge remote-tracking branch 'origin/master' into gcc-9
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 854b033f056..13a2713896a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1194,6 +1194,12 @@ githubId = 30435868; name = "Okina Matara"; }; + chkno = { + email = "chuck@intelligence.org"; + github = "chkno"; + githubId = 1118859; + name = "Scott Worley"; + }; choochootrain = { email = "hurshal@imap.cc"; github = "choochootrain"; @@ -1563,6 +1569,12 @@ githubId = 14032; name = "Daniel Brockman"; }; + dduan = { + email = "daniel@duan.ca"; + github = "dduan"; + githubId = 75067; + name = "Daniel Duan"; + }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; @@ -2030,6 +2042,12 @@ github = "ericnorris"; githubId = 1906605; }; + Enteee = { + email = "nix@duckpond.ch"; + github = "Enteee"; + githubid = 5493775; + name = "Ente"; + }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; |