summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-04-11 14:55:52 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-04-11 14:55:52 +0200
commitee6894ca1297afe0caf2f389c1f9a9220826b749 (patch)
tree02f96b5744cef8bc55010fb8301f5b50c0748d4c /maintainers
parent392874b9b1411dc7b879997bd8776b921feea61d (diff)
parent617c26df84d5670574864a9ccad0eaf8708bd86a (diff)
downloadnixpkgs-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar
nixpkgs-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz
nixpkgs-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2
nixpkgs-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz
nixpkgs-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz
nixpkgs-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst
nixpkgs-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip
Merge staging into master
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 77c648c39dc..5f47c859a8e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3760,6 +3760,11 @@
     github = "twey";
     name = "James ‘Twey’ Kay";
   };
+  typetetris = {
+    email = "ericwolf42@mail.com";
+    github = "typetetris";
+    name = "Eric Wolf";
+  };
   unode = {
     email = "alves.rjc@gmail.com";
     github = "unode";