Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links

Neilj/fix room invite mail links

changelog.d/3868.bugfix

+Fix broken invite email links for self hosted riots 

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"