diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-10 12:05:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-10 12:05:05 +0000 |
commit | 51dce04dde9ae1d586ee35fad8258d4e85f703c8 (patch) | |
tree | 1fb8c298d6b658d9e05a30041bc09c184e3c383e /maintainers | |
parent | da8d931c824ff457c06167c2017b60ef54229e39 (diff) | |
parent | 3f7c764f0eef19e3c850ce2e96a40ef1bbef62af (diff) | |
download | nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.gz nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.bz2 nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.lz nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.xz nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.tar.zst nixpkgs-51dce04dde9ae1d586ee35fad8258d4e85f703c8.zip |
Merge master into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8cc9d1a981..42e81ce82a1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2683,6 +2683,16 @@ githubId = 10198051; name = "Drew Risinger"; }; + drupol = { + name = "Pol Dellaiera"; + email = "pol.dellaiera@protonmail.com"; + github = "drupol"; + githubId = 252042; + keys = [{ + longkeyid = "ed25519/0x0AAF2901E8040715"; + fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; + }]; + }; dschrempf = { name = "Dominik Schrempf"; email = "dominik.schrempf@gmail.com"; |