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>2023-12-28 00:12:33 +0000
committerGitHub <noreply@github.com>2023-12-28 00:12:33 +0000
commitf6041392157aa5a48d897711c87237c7530d3f28 (patch)
tree96d0c3bef551d08f1518e7f5b45150543f4799b7 /maintainers
parentb2e27ff5316260759d3b36d579710664ec38f0c2 (diff)
parentddd6c029b5c40b5107d2b4967ac6f49ad10f2722 (diff)
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b0c4e245e52ce..58bb5cbd2ad22 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -711,6 +711,15 @@
     githubId = 20405311;
     name = "Aksh Gupta";
   };
+  al3xtjames = {
+    email = "nix@alextjam.es";
+    github = "al3xtjames";
+    githubId = 5672538;
+    name = "Alex James";
+    keys = [{
+      fingerprint = "F354 FFAB EA89 A49D 33ED  2590 4729 B829 AC5F CC72";
+    }];
+  };
   alanpearce = {
     email = "alan@alanpearce.eu";
     github = "alanpearce";
@@ -16016,7 +16025,7 @@
   };
   running-grass = {
     name = "Leo Liu";
-    email = "467195537@qq.com";
+    email = "hi@grass.show";
     github = "running-grass";
     githubId = 17241154;
     keys = [{