summary refs log tree commit diff
path: root/synapse/federation/units.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-05-23 10:54:14 +0100
committerErik Johnston <erik@matrix.org>2018-05-23 10:54:14 +0100
commit6e11803ed3669fb897fe61da168eb033ad495198 (patch)
tree936c98227c65d687318c3d573a4c4a5a5fdb1e33 /synapse/federation/units.py
parentMerge pull request #3226 from matrix-org/erikj/chunk_base (diff)
parentMerge pull request #3265 from matrix-org/erikj/limit_pagination (diff)
downloadsynapse-6e11803ed3669fb897fe61da168eb033ad495198.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/room_chunks
Diffstat (limited to 'synapse/federation/units.py')
0 files changed, 0 insertions, 0 deletions