summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-04-23 12:04:50 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-04-23 12:04:50 -0400
commit68384d96fd22a874b62caa21d51418d447259b0d (patch)
tree0aa751070f6d62b92fd607f67c59b13c61d0039a /synapse/rest
parentRevert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t... (diff)
parentMerge tag 'v1.12.4' (diff)
downloadsynapse-68384d96fd22a874b62caa21d51418d447259b0d.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions