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

2017-06-06 11:47:01 +01:00
parent 20e5490ddd 66b121b2fc
commit e73191fffc
1 changed files with 1 additions and 1 deletions
@@ -57,7 +57,7 @@ class PusherFactory(object):
            logger.info("found pusher")
            return self.pusher_types[pusherdict['kind']](self.hs, pusherdict)

-    def _create_email_pusher(self, pusherdict):
+    def _create_email_pusher(self, _hs, pusherdict):
        app_name = self._brand_from_pusherdict
        mailer = self.mailers.get(app_name)
        if not mailer: