about summary refs log tree commit diff
path: root/maintainers
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2023-01-08 16:34:30 +0100
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-01-08 16:34:30 +0100
commit4d65509504f9a08f67bcf47dd93feb7a1098084c (patch)
treebc5a75853654c6be09992cce0c39222535e2fde2 /maintainers
parent08d449ce6df035fcf7a5c6efb525c32ac0a9e355 (diff)
parent194b1690e7a94880b74abe538f43a371ec8b4f37 (diff)
downloadnixlib-4d65509504f9a08f67bcf47dd93feb7a1098084c.tar
nixlib-4d65509504f9a08f67bcf47dd93feb7a1098084c.tar.gz
nixlib-4d65509504f9a08f67bcf47dd93feb7a1098084c.tar.bz2
nixlib-4d65509504f9a08f67bcf47dd93feb7a1098084c.tar.lz
nixlib-4d65509504f9a08f67bcf47dd93feb7a1098084c.tar.xz
nixlib-4d65509504f9a08f67bcf47dd93feb7a1098084c.tar.zst
nixlib-4d65509504f9a08f67bcf47dd93feb7a1098084c.zip
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 71a178377712..ae0c5adecda4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4647,10 +4647,11 @@
   };
   felipeqq2 = {
     name = "Felipe Silva";
-    email = "felipeqq2@outlook.com";
+    email = "nixpkgs@felipeqq2.rocks";
     github = "felipeqq2";
     githubId = 71830138;
     keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A  AA8C 2FD3 4A9E 2671 91B8"; }];
+    matrix = "@felipeqq2:pub.solar";
   };
   felixscheinost = {
     name = "Felix Scheinost";