diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-29 15:59:05 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-29 15:59:05 +0100 |
commit | f1bdf40dda5eaba622103b64e749b539e5ce6bf1 (patch) | |
tree | a2a09ff016223528aafa4ce50c9b12698e44c6b1 /synapse/rest/__init__.py | |
parent | No longer need the Freenode verification key file (diff) | |
parent | Unbreak tests after changing storage API (diff) | |
download | synapse-f1bdf40dda5eaba622103b64e749b539e5ce6bf1.tar.xz |
Merge branch 'whois' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/rest/__init__.py')
-rw-r--r-- | synapse/rest/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py |