diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-04-18 07:42:26 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-04-18 07:42:26 +0200 |
commit | d96487b9cadb27aba64cb05c2e4962fb3c9e1890 (patch) | |
tree | 901e2d0a53fd23b7579ca3dddfbd8b533c46d39c /maintainers | |
parent | 312e9037f49bf0b163d071dc68fe76c2b5d77319 (diff) | |
parent | eb4acb6ca9c4482e7a65d4b1aaf4ec7c48ea6641 (diff) |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1582510
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9f510690c196..1307b293fe98 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4225,6 +4225,12 @@ githubId = 32152; name = "Luka Blaskovic"; }; + lbpdt = { + email = "nix@pdtpartners.com"; + github = "lbpdt"; + githubId = 45168934; + name = "Louis Blin"; + }; ldelelis = { email = "ldelelis@est.frba.utn.edu.ar"; github = "ldelelis"; @@ -8121,6 +8127,12 @@ githubId = 3889405; name = "vyp"; }; + wamserma = { + name = "Markus S. Wamser"; + email = "github-dev@mail2013.wamser.eu"; + github = "wamserma"; + githubId = 60148; + }; waynr = { name = "Wayne Warren"; email = "wayne.warren.s@gmail.com"; @@ -8431,6 +8443,12 @@ githubId = 250877; name = "Elmar Athmer"; }; + zakkor = { + email = "edward.dalbon@gmail.com"; + github = "zakkor"; + githubId = 6191421; + name = "Edward d'Albon"; + }; zef = { email = "zef@zef.me"; name = "Zef Hemel"; |