summaryrefslogtreecommitdiffstats
path: root/maintainers
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-01-24 20:41:42 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-01-24 20:41:42 +0100
commitcc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d (patch)
treee72cb717dfc1161f4a6a2218cc11dc6a07bdec05 /maintainers
parent09e2990117c2eb0f9ab054ecf65cda7d55ca0dfc (diff)
parent27955d37e97b5a35c83222345f057b322334c7ac (diff)
Merge branch 'master' into staging-next
Diffstat (limited to 'maintainers')
-rw-r--r--maintainers/maintainer-list.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 10a994c55da1..e8bc91ca1cb0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3699,6 +3699,12 @@
githubId = 896431;
name = "Chris Hodapp";
};
+ holymonson = {
+ email = "holymonson@gmail.com";
+ github = "holymonson";
+ githubId = 902012;
+ name = "Monson Shao";
+ };
hongchangwu = {
email = "wuhc85@gmail.com";
github = "hongchangwu";