summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2017-04-21 11:35:52 +0100
committerDavid Baker <dave@matrix.org>2017-04-21 11:35:52 +0100
commit2e165295b7a6af244c9d9b364d9a68e6d53dbadf (patch)
tree19faaf5edaefd3020cf2954cb090f378b5e9819f /res
parentPropagate errors sensibly from proxied IS requests (diff)
parentm.read_marker -> m.fully_read (#2128) (diff)
downloadsynapse-2e165295b7a6af244c9d9b364d9a68e6d53dbadf.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagate_error
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions