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-10-17 00:02:46 +0000
committerGitHub <noreply@github.com>2023-10-17 00:02:46 +0000
commitba519bf3b17452d3abb828cdf86d3a4c84e7b835 (patch)
tree3a552e1755dfeecf632a557a0b5cb3c3b10c5032 /maintainers
parent4ef8b60d4d4de2429c1adc8435ee1185495f778c (diff)
parent8c62479810b6133768092e96a0fc1bb0d3bebbb9 (diff)
downloadnixpkgs-ba519bf3b17452d3abb828cdf86d3a4c84e7b835.tar
nixpkgs-ba519bf3b17452d3abb828cdf86d3a4c84e7b835.tar.gz
nixpkgs-ba519bf3b17452d3abb828cdf86d3a4c84e7b835.tar.bz2
nixpkgs-ba519bf3b17452d3abb828cdf86d3a4c84e7b835.tar.lz
nixpkgs-ba519bf3b17452d3abb828cdf86d3a4c84e7b835.tar.xz
nixpkgs-ba519bf3b17452d3abb828cdf86d3a4c84e7b835.tar.zst
nixpkgs-ba519bf3b17452d3abb828cdf86d3a4c84e7b835.zip
Merge staging-next into staging
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a33ca2c2b14..258ad2ca18d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18062,6 +18062,16 @@
     githubId = 1607770;
     name = "Ulrik Strid";
   };
+  unclamped = {
+    name = "Maru";
+    email = "clear6860@tutanota.com";
+    matrix = "@unhidden0174:matrix.org";
+    github = "unclamped";
+    githubId = 104658278;
+    keys = [{
+      fingerprint = "57A2 CC43 3068 CB62 89C1  F1DA 9137 BB2E 77AD DE7E";
+    }];
+  };
   unclechu = {
     name = "Viacheslav Lotsmanov";
     email = "lotsmanov89@gmail.com";