about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-01-04 21:13:19 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-01-04 21:13:19 +0100
commit9618abe87c966250ecd7e0156a298cc07b35ba51 (patch)
treef5734612a231bab92e74364d914e52bef3676826 /maintainers
parent030f66400db0ce32f988045e5b35b27d75f2fe33 (diff)
parent1a7d28e31f3f66f5806b9b150b978aef9b5fbe7e (diff)
downloadnixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar
nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.gz
nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.bz2
nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.lz
nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.xz
nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.tar.zst
nixlib-9618abe87c966250ecd7e0156a298cc07b35ba51.zip
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 71422e4ed5a6..f72d02bcbfde 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1750,6 +1750,11 @@
     github = "hamhut1066";
     name = "Hamish Hutchings";
   };
+  hansjoergschurr = {
+    email = "commits@schurr.at";
+    github = "hansjoergschurr";
+    name = "Hans-Jörg Schurr";
+  };
   haslersn = {
     email = "haslersn@fius.informatik.uni-stuttgart.de";
     github = "haslersn";
@@ -3911,6 +3916,10 @@
     github = "fkz";
     name = "Fabian Schmitthenner";
   };
+  schmittlauch = {
+    email = "t.schmittlauch+nixos@orlives.de";
+    github = "schmittlauch";
+  };
   schneefux = {
     email = "schneefux+nixos_pkg@schneefux.xyz";
     github = "schneefux";