about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-12-24 15:02:29 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-12-24 15:02:29 +0100
commitef935fa1016ba6209a8882f4ccd776c5272a4359 (patch)
tree8d4c66fda8f30dc3bb2a1c5ce5da5b7fca999dd8 /maintainers
parentd5d15828b51a7d4fd7eee82c6e9a1b261aa49115 (diff)
parentdd3eea4b476552cbdf95388179bfdd668d04b8b7 (diff)
downloadnixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar
nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.gz
nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.bz2
nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.lz
nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.xz
nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.zst
nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.zip
Merge branch 'master' into staging
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9c47599b73ed..48474b21235d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -256,6 +256,11 @@
     github = "AndrewMorsillo";
     name = "Andrew Morsillo";
   };
+  andersk = {
+    email = "andersk@mit.edu";
+    github = "andersk";
+    name = "Anders Kaseorg";
+  };
   AndersonTorres = {
     email = "torres.anderson.85@protonmail.com";
     github = "AndersonTorres";
@@ -1324,6 +1329,11 @@
     github = "ellis";
     name = "Ellis Whitehead";
   };
+  elohmeier = {
+    email = "elo-nixos@nerdworks.de";
+    github = "elohmeier";
+    name = "Enno Lohmeier";
+  };
   elseym = {
     email = "elseym@me.com";
     github = "elseym";