diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-06 12:01:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 12:01:18 +0000 |
| commit | b05583e319a68366a4d972589081f6b8c52bfa15 (patch) | |
| tree | 37b779d44db1d64d06f22043d1bb41c17aac57a0 /maintainers | |
| parent | 99b070940c8137a0b27f47d2431f85f015ab2100 (diff) | |
| parent | 318a6a6b52689141c8eff2e3529f8f09ee9a9c28 (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 12 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff48ec64b1ed7..cd2b6eaacac09 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -780,6 +780,12 @@ github = "akgrant43"; githubId = 2062166; }; + akhilmhdh = { + email = "akhilmhdh@infisical.com"; + github = "akhilmhdh"; + githubId = 31166322; + name = "Akhil Mohan"; + }; akho = { name = "Alexander Khodyrev"; email = "a@akho.name"; @@ -9421,12 +9427,6 @@ githubId = 6445082; name = "Joseph Lukasik"; }; - jgoux = { - email = "hi@jgoux.dev"; - github = "jgoux"; - githubId = 1443499; - name = "Julien Goux"; - }; jhh = { email = "jeff@j3ff.io"; github = "jhh"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 96ab9d94a1696..2a50f6f98d095 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -460,6 +460,14 @@ with lib.maintainers; { shortName = "Home Assistant"; }; + infisical = { + members = [ + akhilmhdh + ]; + scope = "Maintain Infisical"; + shortName = "Infisical"; + }; + iog = { members = [ cleverca22 |