summary refs log tree commit diff
path: root/synapse/http/additional_resource.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-07-24 14:03:37 +0100
committerMatthew Hodgson <matthew@matrix.org>2018-07-24 14:03:37 +0100
commit454f59b7ad70076865186c7d9e25b75377660a32 (patch)
tree949bbdd35ddd587ed4d6c476ce7cd6c7a28752c9 /synapse/http/additional_resource.py
parentclarify comment on p_ids (diff)
parentMerge pull request #3592 from matrix-org/erikj/speed_up_calculate_state_delta (diff)
downloadsynapse-454f59b7ad70076865186c7d9e25b75377660a32.tar.xz
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/http/additional_resource.py')
0 files changed, 0 insertions, 0 deletions