diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-15 10:27:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-15 10:27:20 +0100 |
| commit | 6606f7c659b7271eda2eb177cd111094d37e5215 (patch) | |
| tree | a86fa67c08939849322897a85b7b6a7a452cb255 /synapse/http | |
| parent | Use try..finally in contextlib.contextmanager (diff) | |
| parent | Merge pull request #122 from matrix-org/upgrade_syutil_to_0.0.4 (diff) | |
| download | synapse-6606f7c659b7271eda2eb177cd111094d37e5215.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
Diffstat (limited to '')
| -rw-r--r-- | synapse/rest/key/v1/server_key_resource.py (renamed from synapse/http/server_key_resource.py) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/synapse/http/server_key_resource.py b/synapse/rest/key/v1/server_key_resource.py
index 71e9a51f5c..71e9a51f5c 100644
--- a/synapse/http/server_key_resource.py
+++ b/synapse/rest/key/v1/server_key_resource.py
|