summary refs log tree commit diff
path: root/synapse/http/server_key_resource.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-18 17:37:43 +0000
committerErik Johnston <erik@matrix.org>2015-02-18 17:37:43 +0000
commit7025781df8ab295848cb70a43d0ff8ca5949bc19 (patch)
tree14421f92093e915babba2bc51d00f5d48ebf9437 /synapse/http/server_key_resource.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1 (diff)
parentMerge pull request #82 from matrix-org/git_tag_version (diff)
downloadsynapse-7025781df8ab295848cb70a43d0ff8ca5949bc19.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1
Diffstat (limited to 'synapse/http/server_key_resource.py')
-rw-r--r--synapse/http/server_key_resource.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/http/server_key_resource.py b/synapse/http/server_key_resource.py
index 4fc491dc82..71e9a51f5c 100644
--- a/synapse/http/server_key_resource.py
+++ b/synapse/http/server_key_resource.py
@@ -50,6 +50,7 @@ class LocalKey(Resource):
 
     def __init__(self, hs):
         self.hs = hs
+        self.version_string = hs.version_string
         self.response_body = encode_canonical_json(
             self.response_json_object(hs.config)
         )
@@ -82,7 +83,10 @@ class LocalKey(Resource):
         return json_object
 
     def render_GET(self, request):
-        return respond_with_json_bytes(request, 200, self.response_body)
+        return respond_with_json_bytes(
+            request, 200, self.response_body,
+            version_string=self.version_string
+        )
 
     def getChild(self, name, request):
         if name == '':