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 master into dev #2975

Merged
merged 14 commits into from
Dec 7, 2023
Merged

Merge master into dev #2975

merged 14 commits into from
Dec 7, 2023

Conversation

Keith-CY
Copy link
Collaborator

@Keith-CY Keith-CY commented Dec 6, 2023

Resolve conflicts between master and develop(#2974) and merge master into develop

@Keith-CY Keith-CY changed the title chore: Update ckb node assume valid target for rc/v0.112.0. Merge master into dev Dec 7, 2023
@Keith-CY Keith-CY enabled auto-merge December 7, 2023 05:35
@Keith-CY
Copy link
Collaborator Author

Keith-CY commented Dec 7, 2023

@zhangyouxin @homura @WhiteMinds @devchenyan please have a review

Copy link
Collaborator

@homura homura left a comment

Choose a reason for hiding this comment

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

LGTM

@Keith-CY Keith-CY added this pull request to the merge queue Dec 7, 2023
Merged via the queue into develop with commit 517048d Dec 7, 2023
24 checks passed
@Keith-CY Keith-CY deleted the merge-master-into-dev branch December 7, 2023 05:59
yanguoyu added a commit to yanguoyu/neuron that referenced this pull request Mar 14, 2024
* chore: Update ckb node assume valid target for rc/v0.112.0.

* chore: update versions and changelogs

* feat: Update Neuron compatibility table

* fix: Fix light client sync tx type. (nervosnetwork#2965)

* fix: Fix light client sync tx type.

* feat: update ckb client versions (nervosnetwork#2970)

* chore: Update ckb node assume valid target (nervosnetwork#2968)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update Neuron compatibility table (nervosnetwork#2971)

Co-authored-by: Keith-CY <[email protected]>

* chore: Update ckb node assume valid target for rc/v0.112.0. (nervosnetwork#2972)

* chore: update release date

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Keith-CY <[email protected]>
Co-authored-by: 严国宇 <[email protected]>
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.

3 participants