diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-02 23:25:24 +0200 |
| commit | f21211ebfe21797c6f0444d42ec7cb835c737388 (patch) | |
| tree | 816465981f650242d4b22e0f01b912917e7008f8 /maintainers/maintainer-list.nix | |
| parent | b291f2a9953d48d6edc5c73776db9ba289ccf213 (diff) | |
| parent | 12ae04518b004adf949a43125954b99c05189e6f (diff) | |
| download | nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.gz nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.bz2 nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.lz nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.xz nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.tar.zst nixlib-f21211ebfe21797c6f0444d42ec7cb835c737388.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8d047db0e00c..397bec6057dc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; |