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

[Gitflow] Merge master into develop #11658

Merged
merged 4 commits into from
Apr 17, 2024
Merged

[Gitflow] Merge master into develop #11658

merged 4 commits into from
Apr 17, 2024

Conversation

HazAT
Copy link
Member

@HazAT HazAT commented Apr 17, 2024

Merge master branch into develop

s1gr1d and others added 3 commits April 17, 2024 12:38
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Lukas Stracke <lukas.stracke@sentry.io>
Co-authored-by: Luca Forstner <luca.forstner@sentry.io>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tim Fish <tim@timfish.uk>
Co-authored-by: Francesco Novy <francesco.novy@sentry.io>
Co-authored-by: Catherine Lee <55311782+c298lee@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Auto approved automated PR

…ario (#11636) (#11659)

For some reason, this commit (#11564) caused a conflict in our
master->develop sync. Let's fix this by cherry picking it onto master.
Copy link
Member

@Lms24 Lms24 left a comment

Choose a reason for hiding this comment

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

Should work now 🤞

@github-actions github-actions bot merged commit c014a79 into develop Apr 17, 2024
61 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants