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-29 12:06:05 +0000
committerGitHub <noreply@github.com>2022-03-29 12:06:05 +0000
commit5a9b6a3f1a15e110bfef994ced7768096b5e23be (patch)
treeb7f75f80f4d7fb729735d677bd54c10a9ac13a5c /maintainers
parent25c014324ba0657681bec17f25d5f70fc9e411e8 (diff)
parente7da834115e855f2a5c802a8ab4c9c8e1a6d97ea (diff)
downloadnixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar
nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.gz
nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.bz2
nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.lz
nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.xz
nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.tar.zst
nixpkgs-5a9b6a3f1a15e110bfef994ced7768096b5e23be.zip
Merge master into staging-next
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 effb90c9980..1692282ff1d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10306,6 +10306,16 @@
     githubId = 16487165;
     name = "Rafael Basso";
   };
+  rbreslow = {
+    name = "Rocky Breslow";
+    email = "1774125+rbreslow@users.noreply.github.com";
+    github = "rbreslow";
+    githubId = 1774125;
+    keys = [{
+      longkeyid = "ed25519/0xA0D32ACCA38B88ED";
+      fingerprint = "B5B7 BCA0 EE6F F31E 263A  69E3 A0D3 2ACC A38B 88ED";
+    }];
+  };
   rbrewer = {
     email = "rwb123@gmail.com";
     github = "rbrewer123";