diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-29 13:34:38 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-29 13:34:38 +0100 |
| commit | 64991b0c8ba6f8aefe11ce2d7efcd2363c2ddae3 (patch) | |
| tree | f2f2f8b40c3949de88ef340cd4f25fa854beca12 /synapse/server.py | |
| parent | Merge pull request #135 from matrix-org/erikj/postgres_charset_check (diff) | |
| parent | bump database schema version (diff) | |
| download | synapse-64991b0c8ba6f8aefe11ce2d7efcd2363c2ddae3.tar.xz | |
Merge pull request #129 from matrix-org/key_distribution
Key distribution v2
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 af87dab12c..d61a228c36 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -79,6 +79,7 @@ class BaseHomeServer(object): 'resource_for_web_client', 'resource_for_content_repo', 'resource_for_server_key', + 'resource_for_server_key_v2', 'resource_for_media_repository', 'resource_for_metrics', 'event_sources', |