diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-19 14:48:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-19 14:48:19 +0100 |
| commit | 347242a5c408d4ceb1880f6b90c8e9c658226dde (patch) | |
| tree | 12a25b72d8f13a48f99441c249c3c531c79fff66 /synapse/server.py | |
| parent | Fix bug where we sometimes set min_token to None. (diff) | |
| parent | Proofing (diff) | |
| download | synapse-347242a5c408d4ceb1880f6b90c8e9c658226dde.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index 0f7ac352ae..d4c2481483 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -72,6 +72,7 @@ class BaseHomeServer(object): 'resource_for_client', 'resource_for_federation', 'resource_for_web_client', + 'resource_for_content_repo', ] def __init__(self, hostname, **kwargs): @@ -140,6 +141,7 @@ class HomeServer(BaseHomeServer): resource_for_client resource_for_web_client resource_for_federation + resource_for_content_repo http_client db_pool """ |