R4R: Manually merge develop branch into master to solve the conflict #316
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
IRISHUB-33 基于iris-hub 0.1.0版本修复delegate超过1/3网络崩溃问题
添加docker配置
merge feature/tags to master
merge feature/pangu to master
modify postTx from broadcaseAndCommit to brocastTxSync
update cosmos-sdk to v0.19.0
update iris-hub to irishub
update iris version command
IRISHUB-423:Edit README
Hotfix/0.4.1 Fix links
Hotfix/0.4.1 Typo fix
IRISTNET-126:add iris-atto
Hotfix/0.4.1 add iris-atto
Update SDK deps to v0.23.0-iris5 due to the consensus failure issue
Hotfix v0.4.2
IRISHUB-420 : upgrade to 3001
wukongcheng
force-pushed
the
merge_dev_into_master
branch
from
dcec129
to
ed67172
Compare
…ge_dev_into_master
wukongcheng
force-pushed
the
merge_dev_into_master
branch
from
ed67172
to
90e24f7
Compare
wukongcheng
changed the title
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.