summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-09-20 13:32:38 +0100
committerGitHub <noreply@github.com>2018-09-20 13:32:38 +0100
commit23b53b4ef811092f47fb6a6e80253fb8808fdd6b (patch)
treeb7db1202389e9e11e0acc4a7a96c009f581e4ebd /synapse
parentFix client IPs being broken on Python 3 (#3908) (diff)
parentMerge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail... (diff)
downloadsynapse-23b53b4ef811092f47fb6a6e80253fb8808fdd6b.tar.xz
Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links
Neilj/fix room invite mail links
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/mailer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index b78ce10396..1a5a10d974 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -441,7 +441,7 @@ class Mailer(object):
 
     def make_room_link(self, room_id):
         if self.hs.config.email_riot_base_url:
-            base_url = self.hs.config.email_riot_base_url
+            base_url = "%s/#/room" % (self.hs.config.email_riot_base_url)
         elif self.app_name == "Vector":
             # need /beta for Universal Links to work on iOS
             base_url = "https://vector.im/beta/#/room"