Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing

1 files changed, 1 insertions, 0 deletions

diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py

index 1e53f2c635..da914c46ff 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -534,4 +534,5 @@ class RegistrationHandler(BaseHandler):
             room_id=room_id,
             remote_room_hosts=remote_room_hosts,
             action="join",
+            ratelimit=False,
         )