summary refs log tree commit diff
path: root/.circleci/merge_base_branch.sh
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-10-01 15:54:24 +0100
committerGitHub <noreply@github.com>2018-10-01 15:54:24 +0100
commitb5b93f45d5eea071de71ef433d7c3797a2e6a5c1 (patch)
tree5b0d12150241cb2aad5f6dcd935c1a1a0f512fd8 /.circleci/merge_base_branch.sh
parentFix userconsent on Python 3 (#3938) (diff)
parentMerge remote-tracking branch 'origin/develop' into rav/fix_federation_errors (diff)
downloadsynapse-b5b93f45d5eea071de71ef433d7c3797a2e6a5c1.tar.xz
Merge pull request #3968 from matrix-org/rav/fix_federation_errors
Fix exceptions when handling incoming transactions
Diffstat (limited to '.circleci/merge_base_branch.sh')
0 files changed, 0 insertions, 0 deletions