Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge in upstream v0.10.6 #30

Merged
merged 14 commits into from
Apr 29, 2024
Merged

Merge in upstream v0.10.6 #30

merged 14 commits into from
Apr 29, 2024

Conversation

AndrewFerr
Copy link
Member

Includes #28 and #29, so those should be merged first.

This is a non-trivial merge because our downstream changes had to migrate to the new zerolog-based logging & usage of contexts.

@AndrewFerr AndrewFerr requested a review from a team as a code owner March 26, 2024 08:52
@AndrewFerr
Copy link
Member Author

Rebased onto v0.10.5-mod-2.

@AndrewFerr AndrewFerr changed the title Merge with v0.10.6 Merge in upstream v0.10.6 Apr 29, 2024
Copy link
Member

@Half-Shot Half-Shot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's give it a shot.

@AndrewFerr AndrewFerr merged commit ef0768b into element-main Apr 29, 2024
4 checks passed
@AndrewFerr AndrewFerr deleted the af/upstream-intake branch April 29, 2024 11:57
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.

5 participants