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

Update and Fix #131

Merged
merged 19 commits into from
Dec 3, 2019
Merged

Update and Fix #131

merged 19 commits into from
Dec 3, 2019

Conversation

aurexav
Copy link
Member

@aurexav aurexav commented Dec 3, 2019

fix: cli, can_withdraw for NormalLock

patch: temporarily disable #129

update: runtime

Copy link
Contributor

@hackfisher hackfisher left a comment

Choose a reason for hiding this comment

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

Need to resolve code conflicts.

# Conflicts:
#	node/runtime/src/lib.rs
#	types.json
@aurexav aurexav requested a review from hackfisher December 3, 2019 03:44
@aurexav
Copy link
Member Author

aurexav commented Dec 3, 2019

Need to resolve code conflicts.

Done.

@hackfisher hackfisher merged commit bfb901e into darwinia-network:develop Dec 3, 2019
@aurexav aurexav deleted the update-and-fix branch December 3, 2019 10:30
boundless-forest pushed a commit that referenced this pull request Aug 1, 2023
* Add CODEOWNERS

* Add comments on what CODEOWNERS mean
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.

2 participants