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-09-11 18:01:19 +0000
committerGitHub <noreply@github.com>2022-09-11 18:01:19 +0000
commit6ec60fd2225cf57a06129b9bca02b10d4db4271f (patch)
tree9e4e5849d806b33bd48b1de782f5a7d7ab417034 /maintainers
parent58b4241dc4066d57dcd865699f2a90fa4bea04a2 (diff)
parentee51699e2d4c51dab524a6d8c639531cc4df64f8 (diff)
downloadnixlib-6ec60fd2225cf57a06129b9bca02b10d4db4271f.tar
nixlib-6ec60fd2225cf57a06129b9bca02b10d4db4271f.tar.gz
nixlib-6ec60fd2225cf57a06129b9bca02b10d4db4271f.tar.bz2
nixlib-6ec60fd2225cf57a06129b9bca02b10d4db4271f.tar.lz
nixlib-6ec60fd2225cf57a06129b9bca02b10d4db4271f.tar.xz
nixlib-6ec60fd2225cf57a06129b9bca02b10d4db4271f.tar.zst
nixlib-6ec60fd2225cf57a06129b9bca02b10d4db4271f.zip
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix18
1 files changed, 18 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b0e973d82fea..d6bc60ea36bf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2780,6 +2780,12 @@
     githubId = 34543609;
     name = "creator54";
   };
+  crinklywrappr = {
+    email = "crinklywrappr@pm.me";
+    name = "Daniel Fitzpatrick";
+    github = "crinklywrappr";
+    githubId = 56522;
+  };
   cript0nauta = {
     email = "shareman1204@gmail.com";
     github = "cript0nauta";
@@ -4310,6 +4316,12 @@
     githubId = 7670450;
     name = "Federico Beffa";
   };
+  fbergroth = {
+    email = "fbergroth@gmail.com";
+    github = "fbergroth";
+    githubId = 1211003;
+    name = "Fredrik Bergroth";
+  };
   fbrs = {
     email = "yuuki@protonmail.com";
     github = "cideM";
@@ -15315,4 +15327,10 @@
     githubId = 7775707;
     name = "RB";
   };
+  bpaulin = {
+    email = "brunopaulin@bpaulin.net";
+    github = "bpaulin";
+    githubId = 115711;
+    name = "bpaulin";
+  };
 }