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-30 18:01:02 +0000
committerGitHub <noreply@github.com>2023-10-30 18:01:02 +0000
commit931938d1df438b671516809126e433b9793f0106 (patch)
tree6ea73609039691bd71d8fcca7a6b970fd475ddb5 /maintainers
parent7f11b9b46bf4693acc2d94a04b2b59ea239c4cc2 (diff)
parentfe1e9d524b7ac9fac5f8be3ea2a7d177a5a4b4dc (diff)
downloadnixpkgs-931938d1df438b671516809126e433b9793f0106.tar
nixpkgs-931938d1df438b671516809126e433b9793f0106.tar.gz
nixpkgs-931938d1df438b671516809126e433b9793f0106.tar.bz2
nixpkgs-931938d1df438b671516809126e433b9793f0106.tar.lz
nixpkgs-931938d1df438b671516809126e433b9793f0106.tar.xz
nixpkgs-931938d1df438b671516809126e433b9793f0106.tar.zst
nixpkgs-931938d1df438b671516809126e433b9793f0106.zip
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0132b970b98..8ffe639b3fb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3680,6 +3680,15 @@
       fingerprint = "2017 E152 BB81 5C16 955C  E612 45BC C1E2 709B 1788";
     }];
   };
+  Cryolitia = {
+    name = "Beiyan Cryolitia";
+    email = "Cryolitia@gmail.com";
+    github = "Cryolitia";
+    githubId = 23723294;
+    keys = [{
+      fingerprint = "1C3C 6547 538D 7152 310C 0EEA 84DD 0C01 30A5 4DF7";
+    }];
+  };
   cryptix = {
     email = "cryptix@riseup.net";
     github = "cryptix";