diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-04-29 19:07:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-29 19:07:17 +0200 |
| commit | f410841566d41cfd4694e5944b79d7b890d5c0aa (patch) | |
| tree | 115c9c69e33f0b7838ffe98737a8ff2275191432 /maintainers/maintainer-list.nix | |
| parent | cb9550ab71a043f2b86053e1e4e8fe4dc9847a26 (diff) | |
| parent | 3d3929c26018682049046d616e2bb78a869a353c (diff) | |
Merge pull request #170672 from felschr/fix/etebase-server
Fix etebase-server pyproject build error
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ae53a56d97697..e8b3232fc75f8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4105,11 +4105,18 @@ matrix = "@felschr:matrix.org"; github = "felschr"; githubId = 3314323; - name = "Felix Tenley"; - keys = [{ - longkeyid = "ed25519/0x910ACB9F6BD26F58"; - fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58"; - }]; + name = "Felix Schröter"; + keys = [ + { + # historical + longkeyid = "ed25519/0x910ACB9F6BD26F58"; + fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58"; + } + { + longkeyid = "ed25519/0x671E39E6744C807D"; + fingerprint = "7E08 6842 0934 AA1D 6821 1F2A 671E 39E6 744C 807D"; + } + ]; }; ffinkdevs = { email = "fink@h0st.space"; |