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

This commit is contained in:
Brendan Abolivier 2019-09-05 14:54:44 +01:00
commit 620e5dd74d

View file

@ -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.