summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-03-30 08:14:35 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-03-30 08:14:35 +0200
commit9d2ff985718b9c04e51fefb1867f82fa0246db0f (patch)
tree3d2aeafe69428756af5a18d8bba8d2b41f5af142 /maintainers
parent01fb1af4f507a2249668d664575717d84b6c1d89 (diff)
parenta7af5d4f88f9e30bc9b401a84b7cb3cf036fccbb (diff)
downloadnixlib-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar
nixlib-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.gz
nixlib-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.bz2
nixlib-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.lz
nixlib-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.xz
nixlib-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.zst
nixlib-9d2ff985718b9c04e51fefb1867f82fa0246db0f.zip
Merge remote-tracking branch 'upstream/master' into HEAD
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 126f35f98560..a64e28564964 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3586,6 +3586,11 @@
     github = "tnias";
     name = "Philipp Bartsch";
   };
+  tobim = {
+    email = "nix@tobim.fastmail.fm";
+    github = "tobimpub";
+    name = "Tobias Mayer";
+  };
   tohl = {
     email = "tom@logand.com";
     github = "tohl";