diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-12-09 11:34:22 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-12-09 11:34:22 +0000 |
| commit | 0f826b0b0d6258411b8bf7fcb3f166d129a5d15d (patch) | |
| tree | 845c784e40754f8fda6be365f8a108250b317d64 /synapse/server.py | |
| parent | Merge pull request #405 from matrix-org/erikj/search-ts (diff) | |
| parent | Actually host r0 and unstable prefixes (diff) | |
| download | synapse-0f826b0b0d6258411b8bf7fcb3f166d129a5d15d.tar.xz | |
Merge pull request #430 from matrix-org/daniel/unstable
Merge pull request #430 from matrix-org/daniel/unstable
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py index f75d5358b2..f5c8329873 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -71,8 +71,7 @@ class BaseHomeServer(object): 'state_handler', 'notifier', 'distributor', - 'resource_for_client', - 'resource_for_client_v2_alpha', + 'client_resource', 'resource_for_federation', 'resource_for_static_content', 'resource_for_web_client', |