Skip to content
Snippets Groups Projects
Unverified Commit 6c91ffc5 authored by dharjeezy's avatar dharjeezy
Browse files

Merge remote-tracking branch 'origin/master' into dami/full_unbond 

# Conflicts:
#	polkadot/runtime/westend/src/weights/pallet_staking.rs
#	substrate/frame/nomination-pools/test-transfer-stake/src/lib.rs
#	substrate/frame/staking/src/pallet/impls.rs
#	substrate/frame/staking/src/pallet/mod.rs
parents 67034ab1 682f8cd2
Branches
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 784 additions and 93 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment