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-27 00:12:02 +0000
committerGitHub <noreply@github.com>2022-03-27 00:12:02 +0000
commit61d6c3bc7c4ff60b3771502f2d23ddaf4a221d0a (patch)
tree8f1fa0f9ccb84d0350dca488c9ebf99c53fd090d /maintainers
parentf9268040166a01420d396cff7c5fb8b5113a202b (diff)
parent6de161729c81dc98e844793cc9c8fda29d5ef62a (diff)
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f46ff4e080d21..e72c07ac80e1c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7264,6 +7264,17 @@
     githubId = 1267527;
     name = "Daniel Firth";
   };
+  lockejan = {
+    email = "git@smittie.de";
+    matrix = "@jan:smittie.de";
+    github = "lockejan";
+    githubId = 25434434;
+    name = "Jan Schmitt";
+    keys = [{
+      longkeyid = "dsa2048/0xA2BC3C6F14351991";
+      fingerprint = "1763 9903 2D7C 5B82 5D5A  0EAD A2BC 3C6F 1435 1991";
+    }];
+  };
   lodi = {
     email = "anthony.lodi@gmail.com";
     github = "lodi";