diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
| commit | c02da58a9da5c617c80fbeb7205f163e7b410c6f (patch) | |
| tree | 8b166570eb2cbbecb7640d92d072f31add922535 /synapse/server.py | |
| parent | Consume errors in time_bound_deferred (diff) | |
| parent | Merge pull request #74 from matrix-org/federation_min_depth_fix (diff) | |
| download | synapse-c02da58a9da5c617c80fbeb7205f163e7b410c6f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into failures
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index 23bdad0c7c..ba2b2593f1 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -77,6 +77,7 @@ class BaseHomeServer(object): 'resource_for_content_repo', 'resource_for_server_key', 'resource_for_media_repository', + 'resource_for_app_services', 'event_sources', 'ratelimiter', 'keyring', |