diff options
| author | Emma [it/its]@Rory& <root@rory.gay> | 2024-03-22 17:45:19 +0100 |
|---|---|---|
| committer | Emma [it/its]@Rory& <root@rory.gay> | 2024-03-22 17:45:19 +0100 |
| commit | fc3d89ad7422dedb8763783c6ebb5d70fcc2c536 (patch) | |
| tree | d46e22858059b76e8968704926d8f4685853be30 /LibMatrix/Homeservers/AuthenticatedHomeserverMxApiExtended.cs | |
| parent | Changes (diff) | |
| download | LibMatrix-fc3d89ad7422dedb8763783c6ebb5d70fcc2c536.tar.xz | |
Fix merge conficts between machines
Diffstat (limited to 'LibMatrix/Homeservers/AuthenticatedHomeserverMxApiExtended.cs')
0 files changed, 0 insertions, 0 deletions