-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
meta: Merge master into develop #13772
Conversation
meta(changelog): Update changelog for 8.31.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems completely off. develop
already contains the version bumps as well as the the changelog entry for 8.31.0. How can there even be a diff?
Yeah, it's really fucked. But let's merge this and hopefully this will fix things (I guess?) |
Did I merge #13747 somehow incorrectly? |
Not that I could tell 🤔 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
very strange but LGTM I guess 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess this is partially explained by me squash and fast forward merging the previous manual sync. But I still don't understand the supposed file changes 😅
Follow up to #13772, which kind of messed this up a bit...
Not quite sure what is going on there, but let's try this again...
This seems very weird because the changes it shows are on develop, but maybe this helps somehow...