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

Sync with develop #334

Merged
merged 20 commits into from
Sep 29, 2018
Merged

Sync with develop #334

merged 20 commits into from
Sep 29, 2018

Conversation

MrXJC
Copy link
Contributor

@MrXJC MrXJC commented Sep 29, 2018

No description provided.

MrXJC and others added 20 commits September 28, 2018 11:01
强迫症犯了,不好意思
R4R: Finish the upgrade docs
IRISTNET-129 fuxi-3001测试网文档修正
Merge develop into feature/docs
Merge feature/docs into develop
[R4R]: Fix consensus failure when creating validator
Change trust-node default value to true
@wukongcheng wukongcheng merged commit c3859ec into irisnet:feature/gov Sep 29, 2018
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