diff options
| author | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-11-04 13:29:35 +0000 |
| commit | 6a0092d3715a168415619fd253c7fb4da5faf348 (patch) | |
| tree | 72f8553014ff152fecd10a40cd2ad7b46387f44d /synapse/rest/client/v2_alpha/account.py | |
| parent | Fix up comment (diff) | |
| parent | document the REPLICATE command a bit better (#6305) (diff) | |
| download | synapse-6a0092d3715a168415619fd253c7fb4da5faf348.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/rest/client/v2_alpha/account.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 332d7138b1..f26eae794c 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -148,7 +148,7 @@ class PasswordResetSubmitTokenServlet(RestServlet): self.clock = hs.get_clock() self.store = hs.get_datastore() if self.config.threepid_behaviour_email == ThreepidBehaviour.LOCAL: - self.failure_email_template, = load_jinja2_templates( + (self.failure_email_template,) = load_jinja2_templates( self.config.email_template_dir, [self.config.email_password_reset_template_failure_html], ) @@ -479,7 +479,7 @@ class AddThreepidEmailSubmitTokenServlet(RestServlet): self.clock = hs.get_clock() self.store = hs.get_datastore() if self.config.threepid_behaviour_email == ThreepidBehaviour.LOCAL: - self.failure_email_template, = load_jinja2_templates( + (self.failure_email_template,) = load_jinja2_templates( self.config.email_template_dir, [self.config.email_add_threepid_template_failure_html], ) |