summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-12-04 14:29:03 +0000
committerBrendan Abolivier <babolivier@matrix.org>2019-12-04 14:29:03 +0000
commitaeda1b3b94296aac2a2d92dff6f23cf13fe3b4fa (patch)
tree31f509920cdd52a1716da36ae7cf4c7e3be18bdb /synapse/api
parentMerge branch 'develop' into babolivier/context_filters (diff)
parentMerge branch 'develop' into babolivier/context_filters (diff)
downloadsynapse-aeda1b3b94296aac2a2d92dff6f23cf13fe3b4fa.tar.xz
Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse into babolivier/context_filters
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions