diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-03 09:01:51 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-03 09:01:51 +0200 |
| commit | 2c5835b09a1d4966756212902d36b1b8ab242da6 (patch) | |
| tree | ca6c0bc0bb2538ee3dcf32a8b197aac48805f35f /maintainers/maintainer-list.nix | |
| parent | 96e5474329a3c2b2309872fb01b007daaf6d7bdc (diff) | |
| parent | 62d365654cdaf122101c1dde8c5a85b8f38c5504 (diff) | |
| download | nixlib-2c5835b09a1d4966756212902d36b1b8ab242da6.tar nixlib-2c5835b09a1d4966756212902d36b1b8ab242da6.tar.gz nixlib-2c5835b09a1d4966756212902d36b1b8ab242da6.tar.bz2 nixlib-2c5835b09a1d4966756212902d36b1b8ab242da6.tar.lz nixlib-2c5835b09a1d4966756212902d36b1b8ab242da6.tar.xz nixlib-2c5835b09a1d4966756212902d36b1b8ab242da6.tar.zst nixlib-2c5835b09a1d4966756212902d36b1b8ab242da6.zip | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 94ef79ee387b..397bec6057dc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2091,7 +2091,7 @@ githubId = 2817965; name = "f--t"; }; - f-breidenstein = { + fleaz = { email = "mail@felixbreidenstein.de"; github = "fleaz"; githubId = 2489598; @@ -5095,6 +5095,12 @@ githubId = 9568176; name = "Piotr Halama"; }; + puckipedia = { + email = "puck@puckipedia.com"; + github = "puckipedia"; + githubId = 488734; + name = "Puck Meerburg"; + }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; |