diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-01-04 14:02:50 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-01-04 14:02:50 +0000 |
| commit | f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38 (patch) | |
| tree | dc5312558565f8ac01264be21d388e563a5c8c58 /synapse/server.py | |
| parent | Added info abou Martin Giess' auto-deployment process with vagrant/ansible (diff) | |
| parent | Bump changelog and version for v0.12.0 (diff) | |
| download | synapse-f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38.tar.xz | |
Merge remote-tracking branch 'origin/release-v0.12.0' v0.12.0
Diffstat (limited to '')
| -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', |