diff options
author | Erik Johnston <erik@matrix.org> | 2017-10-02 16:20:23 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-10-02 16:20:23 +0100 |
commit | 90d70af269f930f7b76a612ea1946be1fc33a6db (patch) | |
tree | acb44def7327c19932e1017ddd39ab067315c016 /synapse | |
parent | Merge pull request #2480 from matrix-org/rav/federation_client_logging (diff) | |
parent | Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse (diff) | |
download | synapse-90d70af269f930f7b76a612ea1946be1fc33a6db.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |