summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-05-09 15:31:33 +0100
committerErik Johnston <erik@matrix.org>2018-05-09 15:31:33 +0100
commit9896dab8f6cbdf1cdac4549e20e4ed0ba17d5655 (patch)
treee288da53414d96fc48ea02e38aa33a4b449c31da /synapse/federation
parentRefactor get_recent_events_for_room return type (diff)
parentMerge pull request #3196 from matrix-org/erikj/pagination_return (diff)
downloadsynapse-9896dab8f6cbdf1cdac4549e20e4ed0ba17d5655.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_return_pagination
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions