diff options
| author | Shay <hillerys@element.io> | 2022-05-09 13:46:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 13:46:12 -0700 |
| commit | 35b96a09d566ec2cf46cea45bed5ecb94dfa4fd5 (patch) | |
| tree | 8d2b9c5f1d8d5060f4cbf2eef452bfab5c91158f | |
| parent | newsfragement (diff) | |
| parent | Fix inconsistent spelling of 'M_UNRECOGNIZED'. (#12665) (diff) | |
| download | synapse-35b96a09d566ec2cf46cea45bed5ecb94dfa4fd5.tar.xz | |
Merge branch 'develop' into shay/super_docs
| -rw-r--r-- | changelog.d/12665.misc | 1 | ||||
| -rw-r--r-- | synapse/federation/federation_client.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/12665.misc b/changelog.d/12665.misc new file mode 100644 index 0000000000..37b96fea37 --- /dev/null +++ b/changelog.d/12665.misc @@ -0,0 +1 @@ +Fix spelling of `M_UNRECOGNIZED` in comments. diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index b5e0b84cbc..17eff60909 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -618,7 +618,7 @@ class FederationClient(FederationBase): # # Dendrite returns a 404 (with a body of "404 page not found"); # Conduit returns a 404 (with no body); and Synapse returns a 400 - # with M_UNRECOGNISED. + # with M_UNRECOGNIZED. # # This needs to be rather specific as some endpoints truly do return 404 # errors. |