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-01-01 00:56:14 +0000
committerGitHub <noreply@github.com>2021-01-01 00:56:14 +0000
commit999c670119eee8017d2de703e766e6c9ed8527d7 (patch)
tree00571b8849dd2bfc4cf1b722f8daac4f909028cf /maintainers
parent5dffe03f3016195253b3fe610bdbf07a97ee6d43 (diff)
parent9f33d6589afc83fc32098fa788cbf082258243af (diff)
downloadnixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar
nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.gz
nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.bz2
nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.lz
nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.xz
nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.tar.zst
nixpkgs-999c670119eee8017d2de703e766e6c9ed8527d7.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 ef99c09d3c4..ce4a83b70a0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -70,6 +70,12 @@
     githubId = 7414843;
     name = "Nicholas von Klitzing";
   };
+  _3noch = {
+    email = "eacameron@gmail.com";
+    github = "3noch";
+    githubId = 882455;
+    name = "Elliot Cameron";
+  };
   a1russell = {
     email = "adamlr6+pub@gmail.com";
     github = "a1russell";