diff options
author | David Baker <dave@matrix.org> | 2017-04-21 11:35:52 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2017-04-21 11:35:52 +0100 |
commit | 2e165295b7a6af244c9d9b364d9a68e6d53dbadf (patch) | |
tree | 19faaf5edaefd3020cf2954cb090f378b5e9819f /res | |
parent | Propagate errors sensibly from proxied IS requests (diff) | |
parent | m.read_marker -> m.fully_read (#2128) (diff) | |
download | synapse-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