diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:38 +0300 |
| commit | 003473613a084b38a1f0335ba8035461b4190e5d (patch) | |
| tree | cc4598d81eb607acba0d89664fe13fd44138dd7e /maintainers/maintainer-list.nix | |
| parent | 39696b6d56fbe93834a8997057b3507e8cd2a234 (diff) | |
| parent | 50bbc56b0bd87715bc17230365fe5eb441bfac68 (diff) | |
| download | nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.gz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.bz2 nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.lz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.xz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.zst nixlib-003473613a084b38a1f0335ba8035461b4190e5d.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dbcffa431b64..790b72c039e3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -989,9 +989,9 @@ name = "Davor Babic"; }; dbohdan = { - email = "danyil.bohdan@gmail.com"; + email = "dbohdan@dbohdan.com"; github = "dbohdan"; - name = "Danyil Bohdan"; + name = "D. Bohdan"; }; dbrock = { email = "daniel@brockman.se"; @@ -1483,6 +1483,11 @@ github = "georgewhewell"; name = "George Whewell"; }; + gerschtli = { + email = "tobias.happ@gmx.de"; + github = "Gerschtli"; + name = "Tobias Happ"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; @@ -3051,6 +3056,11 @@ email = "philipp@xndr.de"; name = "Philipp Steinpaß"; }; + psyanticy = { + email = "iuns@outlook.fr"; + github = "Assassinkin"; + name = "Psyanticy"; + }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; |