diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
| commit | 0aa59a08d65461149552f68c638655ed2b474510 (patch) | |
| tree | 95b176cf0459529707be2f16d6b87eb96fd4e01a /maintainers | |
| parent | 2cf343fc96b82772b9ab3700fe43eb142d100179 (diff) | |
| parent | 2ab846211c52e3d7bb26b0888c9777598e921591 (diff) | |
| download | nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.gz nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.bz2 nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.lz nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.xz nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.zst nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.zip | |
Merge master into staging
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 89ea065f024..7ea5bb2d106 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1196,6 +1196,11 @@ github = "ElvishJerricco"; name = "Will Fancher"; }; + endgame = { + email = "jack@jackkelly.name"; + github = "endgame"; + name = "Jack Kelly"; + }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; @@ -2495,6 +2500,11 @@ github = "mschristiansen"; name = "Mikkel Christiansen"; }; + msiedlarek = { + email = "mikolaj@siedlarek.pl"; + github = "msiedlarek"; + name = "Mikołaj Siedlarek"; + }; mstarzyk = { email = "mstarzyk@gmail.com"; github = "mstarzyk"; @@ -2644,6 +2654,11 @@ github = "nthorne"; name = "Niklas Thörne"; }; + nyanloutre = { + email = "paul@nyanlout.re"; + github = "nyanloutre"; + name = "Paul Trehiou"; + }; nyarly = { email = "nyarly@gmail.com"; github = "nyarly"; @@ -3258,6 +3273,11 @@ github = "sengaya"; name = "Thilo Uttendorfer"; }; + sephalon = { + email = "me@sephalon.net"; + github = "sephalon"; + name = "Stefan Wiehler"; + }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; |