diff options
| author | Benjamin Staffin <benley@gmail.com> | 2020-06-17 17:22:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 17:22:24 -0400 |
| commit | 19d3665b75f59eb98ca656c2b643a4adc0f0744e (patch) | |
| tree | 455aed025973e748f264df336d5dc0e7ae40dad5 /maintainers/maintainer-list.nix | |
| parent | 13a14e2bfe4ff3b7da222624ce5749218105e465 (diff) | |
| parent | 19dfc1b01149e5d60860cd0f4b0f8abcb3faabbf (diff) | |
| download | nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.gz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.bz2 nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.lz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.xz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.zst nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.zip | |
Merge branch 'master' into benley/melonDS
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f7a7ce20c708..38ed481b7c63 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1616,6 +1616,12 @@ githubId = 12202789; name = "CrazedProgrammer"; }; + cript0nauta = { + email = "shareman1204@gmail.com"; + github = "cript0nauta"; + githubId = 1222362; + name = "MatÃas Lang"; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; @@ -2546,6 +2552,16 @@ githubId = 11909469; name = "Fabian Geiselhart"; }; + fabianhauser = { + email = "fabian.nixos@fh2.ch"; + github = "fabianhauser"; + githubId = 368799; + name = "Fabian Hauser"; + keys = [{ + longkeyid = "rsa4096/0x8A52A140BEBF7D2C"; + fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C"; + }]; + }; fadenb = { email = "tristan.helmich+nixos@gmail.com"; github = "fadenb"; @@ -3867,6 +3883,12 @@ githubId = 11947756; name = "Julien Dehos"; }; + julm = { + email = "julm+nix@sourcephile.fr"; + github = "ju1m"; + githubId = 21160136; + name = "Julien Moutinho"; + }; jumper149 = { email = "felixspringer149@gmail.com"; github = "jumper149"; |