diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-23 18:01:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-23 18:01:14 +0000 |
commit | 48376c056272a385344b9ce15eb1ae010fd28826 (patch) | |
tree | 689d3d56f4f15b0a8c53de2ed4907513a568fc34 /maintainers/maintainer-list.nix | |
parent | 14088729f263f9f5fec1822f0bee00b4d517136d (diff) | |
parent | 176d2084b5751560dfc32ec4a81858c9290d14c5 (diff) | |
download | nixlib-48376c056272a385344b9ce15eb1ae010fd28826.tar nixlib-48376c056272a385344b9ce15eb1ae010fd28826.tar.gz nixlib-48376c056272a385344b9ce15eb1ae010fd28826.tar.bz2 nixlib-48376c056272a385344b9ce15eb1ae010fd28826.tar.lz nixlib-48376c056272a385344b9ce15eb1ae010fd28826.tar.xz nixlib-48376c056272a385344b9ce15eb1ae010fd28826.tar.zst nixlib-48376c056272a385344b9ce15eb1ae010fd28826.zip |
Merge master into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
-rw-r--r-- | maintainers/maintainer-list.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee2014d6525b..4a26fe3f295b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5413,6 +5413,12 @@ fingerprint = "3F35 E4CA CBF4 2DE1 2E90 53E5 03A6 E6F7 8693 6619"; }]; }; + harrisonthorne = { + email = "harrisonthorne@proton.me"; + github = "harrisonthorne"; + githubId = 33523827; + name = "Harrison Thorne"; + }; harvidsen = { email = "harvidsen@gmail.com"; github = "harvidsen"; @@ -6812,6 +6818,12 @@ githubId = 7673602; name = "Jonathan Ringer"; }; + jordanisaacs = { + name = "Jordan Isaacs"; + email = "nix@jdisaacs.com"; + github = "jordanisaacs"; + githubId = 19742638; + }; jorise = { email = "info@jorisengbers.nl"; github = "JorisE"; @@ -15915,10 +15927,4 @@ github = "wuyoli"; githubId = 104238274; }; - jordanisaacs = { - name = "Jordan Isaacs"; - email = "nix@jdisaacs.com"; - github = "jordanisaacs"; - githubId = 19742638; - }; } |