summary refs log tree commit diff
path: root/.circleci/merge_base_branch.sh
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-17 10:18:28 +0100
committerGitHub <noreply@github.com>2019-06-17 10:18:28 +0100
commita9dab970b8703c44ea023b8596d8f33c504f4608 (patch)
tree4339b8a24eafa1e77b96ff785ba710171e1acc72 /.circleci/merge_base_branch.sh
parentMerge pull request #5440 from matrix-org/babolivier/third_party_event_rules (diff)
parentNewsfile (diff)
downloadsynapse-a9dab970b8703c44ea023b8596d8f33c504f4608.tar.xz
Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state
Fix 3PID invite room state over federation.
Diffstat (limited to '.circleci/merge_base_branch.sh')
0 files changed, 0 insertions, 0 deletions