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>2022-03-12 00:10:12 +0000
committerGitHub <noreply@github.com>2022-03-12 00:10:12 +0000
commitb21a69401489149b41d14512487adc06a98bab44 (patch)
treebc880a5f24751da3673d1ed27d1c4da36b50579a /maintainers
parent4eba052b8d10601c6519faca564cdf6cc95e9ad9 (diff)
parent14260bb7ba68fd8c7cc088b71d9ae947bdba4c10 (diff)
downloadnixlib-b21a69401489149b41d14512487adc06a98bab44.tar
nixlib-b21a69401489149b41d14512487adc06a98bab44.tar.gz
nixlib-b21a69401489149b41d14512487adc06a98bab44.tar.bz2
nixlib-b21a69401489149b41d14512487adc06a98bab44.tar.lz
nixlib-b21a69401489149b41d14512487adc06a98bab44.tar.xz
nixlib-b21a69401489149b41d14512487adc06a98bab44.tar.zst
nixlib-b21a69401489149b41d14512487adc06a98bab44.zip
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix17
1 files changed, 17 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 077381e8d30b..f141a9b06b66 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2181,6 +2181,12 @@
     githubId = 42220376;
     name = "Charlotte Van Petegem";
   };
+  cigrainger = {
+    name = "Christopher Grainger";
+    email = "chris@amplified.ai";
+    github = "cigrainger";
+    githubId = 3984794;
+  };
   ciil = {
     email = "simon@lackerbauer.com";
     github = "ciil";
@@ -11676,6 +11682,17 @@
       githubId = 55607356;
       name = "Stephan Heßelmann";
   };
+  steinybot = {
+    name = "Jason Pickens";
+    email = "jasonpickensnz@gmail.com";
+    matrix = "@steinybot:matrix.org";
+    github = "steinybot";
+    githubId = 4659562;
+    keys = [{
+      longkeyid = "ed25519/0x21DE1CAE59762A0F";
+      fingerprint = "2709 1DEC CC42 4635 4299  569C 21DE 1CAE 5976 2A0F";
+    }];
+  };
   stelcodes = {
     email = "stel@stel.codes";
     github = "stelcodes";