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

merge v1.3.4 into develop branch #2033

Merged
merged 10 commits into from
Dec 5, 2023
Merged

merge v1.3.4 into develop branch #2033

merged 10 commits into from
Dec 5, 2023

Conversation

zzzckck
Copy link
Collaborator

@zzzckck zzzckck commented Dec 5, 2023

Description

v1.3.2, v1.3.3 and v1.3.4 are created for the Hertzfix hard fork, they are based on the v1.3.1-beta code base.
need to merge the code into develop.

Rationale

NA

Example

NA

Changes

NA

@zzzckck zzzckck changed the title Develop lock v1.3.4 merge v1.3.4 into develop branch Dec 5, 2023
@zzzckck
Copy link
Collaborator Author

zzzckck commented Dec 5, 2023

pls ignore the lint error this time, it was caused by the manual conflict resolve, will fix the lint error later.

@zzzckck zzzckck merged commit 7e6b43a into develop Dec 5, 2023
@brilliant-lx brilliant-lx deleted the develop_lock_v1.3.4_merge branch December 14, 2023 03:37
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.

4 participants