Skip to content

Conversation

@sumnerevans
Copy link
Contributor

Signed-off-by: Sumner Evans sumner@beeper.com

Pull Request Checklist

@clokep
Copy link
Member

clokep commented Nov 13, 2023

https://github.com/matrix-org/complement/compare/clokep/async-uploads?expand=1 has a merge commit in it which fixes the conflict.

Co-authored-by: Patrick Cloke <patrickc@matrix.org>
Signed-off-by: Sumner Evans <sumner@beeper.com>
@sumnerevans sumnerevans marked this pull request as ready for review November 13, 2023 20:41
@sumnerevans sumnerevans requested review from a team as code owners November 13, 2023 20:41
@clokep clokep removed the request for review from a team November 14, 2023 17:28
@clokep
Copy link
Member

clokep commented Nov 14, 2023

Note that I kicked off a run with the matching branch rules at https://github.com/matrix-org/synapse/actions/runs/6867273574.

@clokep
Copy link
Member

clokep commented Nov 15, 2023

This is tests for MSC2246.

@clokep clokep merged commit 4e1854d into matrix-org:main Nov 15, 2023
@sumnerevans sumnerevans deleted the async-uploads branch November 15, 2023 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants