Skip to content
Commit 89cd7f40 authored by Sergey Pepyakin's avatar Sergey Pepyakin
Browse files

Merge 'origin/master' into ser-apply-clean

# Conflicts:
#	bin/node/executor/src/lib.rs
#	palette/executive/src/lib.rs
#	palette/system/src/lib.rs
#	primitives/sr-primitives/src/testing.rs
#	primitives/sr-primitives/src/traits.rs
parents d0343323 c86d2137
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