summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-21 17:02:54 +0100
committerErik Johnston <erik@matrix.org>2015-05-21 17:02:54 +0100
commitf6d1183fc5f5e687818e6d83394bbd571d24c633 (patch)
treec6b74e6ee0925ba9b31ef2f1fdb0fb1de9dd20ac /synapse/__init__.py
parentMerge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse (diff)
parentDon't try to use a txn when not in one, remove spurious debug logging (diff)
downloadsynapse-f6d1183fc5f5e687818e6d83394bbd571d24c633.tar.xz
Merge branch 'markjh/pusher_performance_master' of github.com:matrix-org/synapse into hotfixes-v0.9.0-r5
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions