diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-18 13:03:13 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-18 13:03:13 +1000 |
| commit | d93966200cd6f5a6b6303186828db7db19d0cefc (patch) | |
| tree | e714a38a225d284348396253814b6e1881ec2d7e /maintainers | |
| parent | f4f60c7cee7af1090c2276eaa12dd5fc116abbc3 (diff) | |
| parent | b7f20dcd026426f900d81b76391d402049b96ca8 (diff) | |
Merge staging-next into staging
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 bd9b5d5b37f6..8bc35fa27928 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -970,6 +970,12 @@ email = "sivaraman.balaji@gmail.com"; name = "Balaji Sivaraman"; }; + baloo = { + email = "nixpkgs@superbaloo.net"; + github = "baloo"; + githubId = 59060; + name = "Arthur Gautier"; + }; balsoft = { email = "balsoft75@gmail.com"; github = "balsoft"; @@ -2031,6 +2037,12 @@ githubId = 23366017; name = "Dan Haraj"; }; + danielbarter = { + email = "danielbarter@gmail.com"; + github = "danielbarter"; + githubId = 8081722; + name = "Daniel Barter"; + }; danieldk = { email = "me@danieldk.eu"; github = "danieldk"; @@ -5614,6 +5626,12 @@ fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; }]; }; + mausch = { + email = "mauricioscheffer@gmail.com"; + github = "mausch"; + githubId = 95194; + name = "Mauricio Scheffer"; + }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; |