diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-02-18 01:12:31 +0000 |
commit | 50053cda79099c9a0b2a7803aef61f730a54848f (patch) | |
tree | 6413bbed5cbdd3f58d26d54cbf1b37d54a8c3a22 /nixpkgs/maintainers | |
parent | 7fbd32a525182f2089e1098723219a1a4ef264bb (diff) | |
parent | 36f316007494c388df1fec434c1e658542e3c3cc (diff) | |
download | nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.gz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.bz2 nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.lz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.xz nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.tar.zst nixlib-50053cda79099c9a0b2a7803aef61f730a54848f.zip |
Merge commit '36f316007494c388df1fec434c1e658542e3c3cc'
Diffstat (limited to 'nixpkgs/maintainers')
-rw-r--r-- | nixpkgs/maintainers/maintainer-list.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index dac1acfefb4c..cc121c15ac88 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -1962,6 +1962,11 @@ github = "ikervagyok"; name = "Balázs Lengyel"; }; + ilikeavocadoes = { + email = "ilikeavocadoes@hush.com"; + github = "ilikeavocadoes"; + name = "Lassi Haasio"; + }; illegalprime = { email = "themichaeleden@gmail.com"; github = "illegalprime"; @@ -4668,7 +4673,7 @@ name = "Thomas Bereknyei"; }; tomsmeets = { - email = "tom@tsmeets.nl"; + email = "tom.tsmeets@gmail.com"; github = "tomsmeets"; name = "Tom Smeets"; }; |