about summary refs log tree commit diff
path: root/maintainers/maintainer-list.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-04-24 09:21:07 -0400
committerGitHub <noreply@github.com>2019-04-24 09:21:07 -0400
commitf5d3418b0ce1f12cba7155f726d1f5d37bf46a35 (patch)
treea407d9866e7db358950bf938fd9e7321f6445e64 /maintainers/maintainer-list.nix
parent65a963235c97ca91260742d35b8b40e1544e33bd (diff)
parent148119b9a6636a4fdfbdc1cc0dcbf268d523008d (diff)
downloadnixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.gz
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.bz2
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.lz
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.xz
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.zst
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.zip
Merge pull request #58994 from zookatron/sublime-merge
sublime-merge: init at 1107
Diffstat (limited to 'maintainers/maintainer-list.nix')
-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 b5ca8131a488..4e9bdebe43f6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5455,6 +5455,11 @@
     github = "zohl";
     name = "Al Zohali";
   };
+  zookatron = {
+    email = "tim@zookatron.com";
+    github = "zookatron";
+    name = "Tim Zook";
+  };
   zoomulator = {
     email = "zoomulator@gmail.com";
     github = "zoomulator";