summary refs log tree commit diff
path: root/synapse/config/api.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-30 11:48:29 +0000
committerErik Johnston <erik@matrix.org>2019-01-30 11:48:29 +0000
commitd351be15670766d634b12f08483b3b4a750f76fb (patch)
tree0a58ea6f751407e66dd7b553e045a737c38e4667 /synapse/config/api.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #4521 from matrix-org/rav/fed_routing/cleanups (diff)
downloadsynapse-d351be15670766d634b12f08483b3b4a750f76fb.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/api.py')
0 files changed, 0 insertions, 0 deletions