summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-04-04 19:36:39 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-04-04 19:36:39 +0200
commit23741692fabcdfee9a8b7f89576236a69d4d4d8a (patch)
treeb3d53e3f97547c93bba340176bee375cb720ebdc /maintainers
parentd051989efa7354384271bb21c5f471cfc05c1541 (diff)
parentb9484875bcc1918945d373e0ea46ffff938adb05 (diff)
downloadnixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.gz
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.bz2
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.lz
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.xz
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.zst
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.zip
Merge master into staging
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 d110b292d82..26f1e3a7d31 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3991,6 +3991,11 @@
     github = "yrashk";
     name = "Yurii Rashkovskii";
   };
+  ysndr = {
+    email = "me@ysndr.de";
+    github = "ysndr";
+    name = "Yannik Sander";
+  };
   yuriaisaka = {
     email = "yuri.aisaka+nix@gmail.com";
     github = "yuriaisaka";