Merge branch 'babolivier/standardised-federation-response-format' of github.com:matrix-org/matrix-doc into babolivier/standardised-federation-response-format

5 years ago · 620e5dd74d
parent cb2b71c0be fc26230007
commit 620e5dd74d
1 changed files with 1 additions and 1 deletions
--- a/proposals/1802-standardised-federation-response-format.md
+++ b/proposals/1802-standardised-federation-response-format.md
@ -46,5 +46,5 @@ code), then the sending server should retry the request with the `v1` API.

 ## Alternative solutions

-An alternative solution would be to make the change in the `v1` fedration API,
+An alternative solution would be to make the change in the `v1` federation API,
 but would break backward compatibility, thus would be harder to manage.