diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-19 09:44:50 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-19 09:44:50 +0200 |
| commit | ff21d4d93bfa76a8ad20660a3513a0f122905b12 (patch) | |
| tree | fa63ee538b2ad5e18c414eabc98bebed0fdc54fa /synapse/server.py | |
| parent | Fill user page with avatar, display name and matrix id (diff) | |
| parent | show private room_ids rather than nulls in notifs if there is no room_alias (diff) | |
| download | synapse-ff21d4d93bfa76a8ad20660a3513a0f122905b12.tar.xz | |
Merge remote-tracking branch 'origin/master' into user_page
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 """ |