summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-22 15:57:12 +0000
committerErik Johnston <erik@matrix.org>2016-01-22 15:57:12 +0000
commit88baa3865e63d41c2ea66d8653126f498d59c5d8 (patch)
treeb72614f02766319751adbaab83064ad25c846714 /synapse/api
parentFix tests (diff)
parentMerge pull request #520 from matrix-org/dbkr/bulk_push_overlay_enabled (diff)
downloadsynapse-88baa3865e63d41c2ea66d8653126f498d59c5d8.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions