summary refs log tree commit diff
path: root/.circleci/merge_base_branch.sh
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-10-02 11:38:35 +0200
committerGitHub <noreply@github.com>2018-10-02 11:38:35 +0200
commitbc29946809b29f2437212c7dd46974abdc269d3d (patch)
treef52158cfe1fa90edc4b907e1bb08525e2868c37c /.circleci/merge_base_branch.sh
parentUpdate instructions to point to pip install (#3985) (diff)
parentNewsfile (diff)
downloadsynapse-bc29946809b29f2437212c7dd46974abdc269d3d.tar.xz
Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state
Fix lazy loaded sync with rejected state events
Diffstat (limited to '.circleci/merge_base_branch.sh')
0 files changed, 0 insertions, 0 deletions