diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-11 18:28:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 18:28:07 +0000 |
| commit | 37c26a396b2b28cd764389ccc4d3b4c5cb83aa5f (patch) | |
| tree | 440900efd139634c187ebcebe007664578fa0dba /maintainers | |
| parent | 1e7a48b47423ea574cdbf9027574c2f7ccd4e53f (diff) | |
| parent | 010661db264f408da24cef0601ea812f51b1a3a0 (diff) | |
| download | nixlib-37c26a396b2b28cd764389ccc4d3b4c5cb83aa5f.tar nixlib-37c26a396b2b28cd764389ccc4d3b4c5cb83aa5f.tar.gz nixlib-37c26a396b2b28cd764389ccc4d3b4c5cb83aa5f.tar.bz2 nixlib-37c26a396b2b28cd764389ccc4d3b4c5cb83aa5f.tar.lz nixlib-37c26a396b2b28cd764389ccc4d3b4c5cb83aa5f.tar.xz nixlib-37c26a396b2b28cd764389ccc4d3b4c5cb83aa5f.tar.zst nixlib-37c26a396b2b28cd764389ccc4d3b4c5cb83aa5f.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 8d28d86149e6..29ff865c935a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7201,6 +7201,16 @@ githubId = 16385648; name = "Niko Pavlinek"; }; + nixbitcoin = { + email = "nixbitcoin@i2pmail.org"; + github = "nixbitcoin"; + githubId = 45737139; + name = "nixbitcoindev"; + keys = [{ + longkeyid = "rsa4096/0xDD11F9AD5308B3BA"; + fingerprint = "577A 3452 7F3E 2A85 E80F E164 DD11 F9AD 5308 B3BA"; + }]; + }; nixinator = { email = "33lockdown33@protonmail.com"; github = "nixinator"; |