Merge remote-tracking branch 'origin/release-v0.12.0' v0.12.0

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',