about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-04-15 18:13:27 +0000
committerGitHub <noreply@github.com>2021-04-15 18:13:27 +0000
commitdfd4f1430301305a0c543f034a95aaae6e3ce09d (patch)
treee451a4f3f1defad8765a1bdcee54846f014741fd /maintainers
parent80e725f3dc9daff0b720b4cb7d7088cdc65e015d (diff)
parentbc5c0c559f1c93ccea9a7f21066b6314831bea3d (diff)
downloadnixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar
nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.gz
nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.bz2
nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.lz
nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.xz
nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.tar.zst
nixlib-dfd4f1430301305a0c543f034a95aaae6e3ce09d.zip
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 487b394baa10..a4d4b1461688 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4067,6 +4067,12 @@
     githubId = 12491746;
     name = "Masato Yonekawa";
   };
+  hzeller = {
+    email = "h.zeller@acm.org";
+    github = "hzeller";
+    githubId = 140937;
+    name = "Henner Zeller";
+  };
   i077 = {
     email = "nixpkgs@imranhossa.in";
     github = "i077";