diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-02 00:03:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-02 00:03:11 +0000 |
| commit | db4424f74a1497c4e5f79d105fe1fa39250dddde (patch) | |
| tree | fac8d8b04a064b372084ac6d73ad157392094f51 /maintainers | |
| parent | f0353a68346c7e1fa00cff6ab5b5a19e953fbc6b (diff) | |
| parent | 39c82b1a851d0d71d68cf03c6a088a48cf19fbfd (diff) | |
Merge staging-next into staging
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index be93cb6af798b..0054a65a28362 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20483,6 +20483,12 @@ github = "thefossguy"; githubId = 44400303; }; + thehans255 = { + name = "Hans Jorgensen"; + email = "foss-contact@thehans255.com"; + github = "thehans255"; + githubId = 15896573; + }; thekostins = { name = "Konstantin"; email = "anisimovkosta19@gmail.com"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 61c3d7873411b..38091b72aa03f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -689,6 +689,7 @@ with lib.maintainers; { dandellion sumnerevans nickcao + teutat3s ]; scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; shortName = "Matrix"; |