diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
commit | f73ea0bda26a51794abedb65cbf4d0a717dee26c (patch) | |
tree | 64fd41675594a7c71a7f119fb68b5b476f9173fd /synapse/rest/client/v2_alpha/account.py | |
parent | Only fire user_joined_room on the distributor if the user has actually joined... (diff) | |
parent | Merge pull request #392 from matrix-org/markjh/client_config (diff) | |
download | synapse-f73ea0bda26a51794abedb65cbf4d0a717dee26c.tar.xz |
Merge branch 'develop' into markjh/edu_frequency
Diffstat (limited to 'synapse/rest/client/v2_alpha/account.py')
-rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 1970ad3458..6f1c33f75b 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -20,7 +20,7 @@ from synapse.api.errors import LoginError, SynapseError, Codes from synapse.http.servlet import RestServlet from synapse.util.async import run_on_reactor -from ._base import client_v2_pattern, parse_json_dict_from_request +from ._base import client_v2_patterns, parse_json_dict_from_request import logging @@ -29,7 +29,7 @@ logger = logging.getLogger(__name__) class PasswordRestServlet(RestServlet): - PATTERN = client_v2_pattern("/account/password") + PATTERNS = client_v2_patterns("/account/password", releases=()) def __init__(self, hs): super(PasswordRestServlet, self).__init__() @@ -89,7 +89,7 @@ class PasswordRestServlet(RestServlet): class ThreepidRestServlet(RestServlet): - PATTERN = client_v2_pattern("/account/3pid") + PATTERNS = client_v2_patterns("/account/3pid", releases=()) def __init__(self, hs): super(ThreepidRestServlet, self).__init__() |