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-02-20 18:17:10 +0000
committerGitHub <noreply@github.com>2021-02-20 18:17:10 +0000
commit7a1ee9c317d209844faa46fc63781a083061ce73 (patch)
tree98734c32e493df42cffb33cfb4845bc544af78b3 /maintainers
parent5884dca2b9d7bc0c505d01e61c270d626f1eb31c (diff)
parent6d771e5330157de230a8431577edb20a8733112b (diff)
downloadnixpkgs-7a1ee9c317d209844faa46fc63781a083061ce73.tar
nixpkgs-7a1ee9c317d209844faa46fc63781a083061ce73.tar.gz
nixpkgs-7a1ee9c317d209844faa46fc63781a083061ce73.tar.bz2
nixpkgs-7a1ee9c317d209844faa46fc63781a083061ce73.tar.lz
nixpkgs-7a1ee9c317d209844faa46fc63781a083061ce73.tar.xz
nixpkgs-7a1ee9c317d209844faa46fc63781a083061ce73.tar.zst
nixpkgs-7a1ee9c317d209844faa46fc63781a083061ce73.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 648d83a2447..3bd3ed9bcb8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -82,6 +82,12 @@
     githubId = 882455;
     name = "Elliot Cameron";
   };
+  _414owen = {
+    email = "owen@owen.cafe";
+    github = "414owen";
+    githubId = 1714287;
+    name = "Owen Shepherd";
+  };
   _6AA4FD = {
     email = "f6442954@gmail.com";
     github = "6AA4FD";