diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-07 18:05:39 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-07 18:05:39 +0100 |
| commit | 4fe95094d1aa9a8a36a32c56d5665ddba825e029 (patch) | |
| tree | d7e88a7b2ce0d41403c7a7afaff3b44088e60324 /synapse/server.py | |
| parent | Retry on deadlock (diff) | |
| parent | update leo's contribs a bit (diff) | |
| download | synapse-4fe95094d1aa9a8a36a32c56d5665ddba825e029.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 1 |
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', |