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

chore: merge upstream 02824da4f #43

Merged
merged 157 commits into from
Nov 25, 2024
Merged

Conversation

Thegaram
Copy link

No description provided.

mattsse and others added 30 commits November 18, 2024 10:17
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
mattsse and others added 26 commits November 22, 2024 19:53
Co-authored-by: Emilia Hane <elsaemiliaevahane@gmail.com>
Co-authored-by: Emilia Hane <elsaemiliaevahane@gmail.com>
…digmxyz#12810)

Co-authored-by: Emilia Hane <elsaemiliaevahane@gmail.com>
Co-authored-by: Emilia Hane <elsaemiliaevahane@gmail.com>
Co-authored-by: github-merge-queue <118344674+github-merge-queue@users.noreply.github.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
Copy link
Collaborator

@frisitano frisitano left a comment

Choose a reason for hiding this comment

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

Looks good. I can't see any conflicts here / issues here. I'd suggest @greged93 also do a quick pass to see if there are any conflicts with the work he's done.

@Thegaram Thegaram merged commit 6a92512 into scroll Nov 25, 2024
42 checks passed
@Thegaram Thegaram deleted the chore-merge-upstream-02824da4f branch November 25, 2024 15:47
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.