Merge master to develop (3.1.0.0.2) #5596
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
merge Release/3.0.0.0.4 to master
Add changlog for epoch 3.1 and revert block version (5538)
Release/3.1.0.0.0
merge Release/3.1.0.0.1 to master
Adding changelog for 3.1.0.0.2.x
merge Release/3.1.0.0.2 to master
jcnelson
approved these changes
Dec 19, 2024
|
Just be sure to fix the changelog conflict before merging, and I'll re-approve. |
ahh i didn't catch that when opening.will do! |
|
closed in favor of #5607 in order to resolve conflicts |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.