summaryrefslogtreecommitdiffstats
path: root/maintainers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-01-18 12:42:12 +0000
committerGitHub <noreply@github.com>2021-01-18 12:42:12 +0000
commit4b0e1b22cfa3493e55083b10bd0e2964e1f50519 (patch)
tree6dc4b39be7692c2b1375a1b134ca86ffd7d19bdd /maintainers
parent22e408d5f10075a0011b5610b22954255601857f (diff)
parentc223ba254c5398825810c16e8b36d1adab8f7251 (diff)
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 8bc35fa27928..bdaec6ce15df 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7135,6 +7135,16 @@
fingerprint = "A3A3 65AE 16ED A7A0 C29C 88F1 9712 452E 8BE3 372E";
}];
};
+ pinpox = {
+ email = "mail@pablo.tools";
+ github = "pinpox";
+ githubId = 1719781;
+ name = "Pablo Ovelleiro Corral";
+ keys = [{
+ longkeyid = "sa4096/0x823A6154426408D3";
+ fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3";
+ }];
+ };
piotr = {
email = "ppietrasa@gmail.com";
name = "Piotr Pietraszkiewicz";