summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-27 15:07:08 +0100
committerErik Johnston <erik@matrix.org>2017-10-27 15:07:08 +0100
commit4ab8abbc2b7376f1fad8b69f05f129a0438d8d20 (patch)
tree692f839a218353f3e1a0263c12ea08a5c7be0019 /setup.py
parentMerge pull request #2595 from matrix-org/erikj/attestation_commnet (diff)
parentImport logger (diff)
downloadsynapse-4ab8abbc2b7376f1fad8b69f05f129a0438d8d20.tar.xz
Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse into develop
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions