Skip to content

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] <[email protected]>
Co-authored-by: Lukas Stracke <[email protected]>
Co-authored-by: Luca Forstner <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tim Fish <[email protected]>
Co-authored-by: Francesco Novy <[email protected]>
Co-authored-by: Catherine Lee <[email protected]>
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
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.

6 participants