summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/auth.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-12-31 11:58:10 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-12-31 11:58:10 +0000
commit6d1b93cf089ba431dbcccbca64b9e6b482caf7d8 (patch)
tree0fcca9eef6cbdde026d825e84a9b83bfb6d58197 /synapse/rest/client/v2_alpha/auth.py
parentMerge commit 'b19b63e6b' into anoa/dinsic_release_1_23_1 (diff)
parentMerge tag 'v1.22.0rc1' into develop (diff)
downloadsynapse-6d1b93cf089ba431dbcccbca64b9e6b482caf7d8.tar.xz
Merge commit '054a6b953' into anoa/dinsic_release_1_23_1
Diffstat (limited to 'synapse/rest/client/v2_alpha/auth.py')
-rw-r--r--synapse/rest/client/v2_alpha/auth.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/auth.py b/synapse/rest/client/v2_alpha/auth.py

index 5fbfae5991..fab077747f 100644 --- a/synapse/rest/client/v2_alpha/auth.py +++ b/synapse/rest/client/v2_alpha/auth.py
@@ -176,9 +176,6 @@ class AuthRestServlet(RestServlet): respond_with_html(request, 200, html) return None - def on_OPTIONS(self, _): - return 200, {} - def register_servlets(hs, http_server): AuthRestServlet(hs).register(http_server)