Merge master into dev#2975
Merged
Merged
Conversation
Release v0.112.0
* fix: Fix light client sync tx type.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Keith-CY <Keith-CY@users.noreply.github.com>
Keith-CY
requested review from
WhiteMinds,
devchenyan,
homura,
yanguoyu and
zhangyouxin
December 6, 2023 18:30
yanguoyu
approved these changes
Dec 7, 2023
Keith-CY
changed the title
Keith-CY
enabled auto-merge
December 7, 2023 05:35
Contributor
Author
|
@zhangyouxin @homura @WhiteMinds @devchenyan please have a review |
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 <Keith-CY@users.noreply.github.com> * 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 <Keith-CY@users.noreply.github.com> Co-authored-by: 严国宇 <841185308@qq.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Resolve conflicts between
masteranddevelop(#2974) and mergemasterintodevelop