summary refs log tree commit diff
path: root/maintainers/maintainer-list.nix
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2020-07-26 09:03:23 +0000
committerGitHub <noreply@github.com>2020-07-26 09:03:23 +0000
commit93013cd8b36a8898fdf55df485c38bddd414b2e0 (patch)
tree64e4012592569ebb224b32cb950f15eda304a710 /maintainers/maintainer-list.nix
parent12f4c3b35785dc7dd301dc7a8562d21a3400201a (diff)
parentfd4e3392fc4317a6ee9a1954e87719d9e7c1c22e (diff)
downloadnixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar
nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.gz
nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.bz2
nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.lz
nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.xz
nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.tar.zst
nixpkgs-93013cd8b36a8898fdf55df485c38bddd414b2e0.zip
Merge pull request #93871 from Chili-Man/terraform-0.12.29-update
terraform: 0.12.28 -> 0.12.29
Diffstat (limited to 'maintainers/maintainer-list.nix')
-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 91bdfb5b083..8c901162e5e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1412,6 +1412,16 @@
     githubId = 30435868;
     name = "Okina Matara";
   };
+  Chili-Man = {
+    email = "dr.elhombrechile@gmail.com";
+    name = "Diego Rodriguez";
+    github = "Chili-Man";
+    githubId = 631802;
+    keys = [{
+      longkeyid = "rsa4096/0xE0EBAD78F0190BD9";
+      fingerprint = "099E 3F97 FA08 3D47 8C75  EBEC E0EB AD78 F019 0BD9";
+    }];
+  };
   chkno = {
     email = "chuck@intelligence.org";
     github = "chkno";