summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-17 10:28:55 +0100
committerErik Johnston <erik@matrix.org>2015-09-17 10:28:55 +0100
commitafe475e9be02873d008d4b7ba095d2f41e3961ed (patch)
tree873f08037f872f1c5c173963a28049fb1ede25b9 /synapse
parentRevert change of scripts/check_auth.py (diff)
parentRemove run_on_reactor (diff)
downloadsynapse-afe475e9be02873d008d4b7ba095d2f41e3961ed.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/atomic_join_federation
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions