summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorKegsay <kegsay@gmail.com>2015-04-01 13:51:15 +0100
committerKegsay <kegsay@gmail.com>2015-04-01 13:51:15 +0100
commit80a620a83a2282d8c740d20a8ca9147071287f2f (patch)
tree3c8d7e4bc69871ac1316a5763d885e5f7a9ba7d7 /synapse/server.py
parentFix thinko whereby events *for the AS specifically* were not passed on. (diff)
parentMerge branch 'develop' into application-services-registration-script (diff)
downloadsynapse-80a620a83a2282d8c740d20a8ca9147071287f2f.tar.xz
Merge pull request #116 from matrix-org/application-services-registration-script
Application services registration changes (PR #116)
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py

index c7772244ba..0bd87bdd77 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -79,7 +79,6 @@ class BaseHomeServer(object): 'resource_for_content_repo', 'resource_for_server_key', 'resource_for_media_repository', - 'resource_for_app_services', 'resource_for_metrics', 'event_sources', 'ratelimiter',