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

1 files changed, 3 insertions, 1 deletions

diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py

index 33b3579425..aea3985a5f 100644
--- a/synapse/appservice/__init__.py
+++ b/synapse/appservice/__init__.py
@@ -94,7 +94,9 @@ class ApplicationService(object):
         ip_range_whitelist=None,
     ):
         self.token = token
-        self.url = url
+        self.url = (
+            url.rstrip("/") if isinstance(url, str) else None
+        )  # url must not end with a slash
         self.hs_token = hs_token
         self.sender = sender
         self.server_name = hostname