Skip to content
Commit f3f3aa8e authored by AlexeyKarasev's avatar AlexeyKarasev
Browse files

Merge branch 'master' into alex-costruct-runtime-proc-macro

# Conflicts:
#	node/runtime/src/lib.rs
#	srml/support/src/runtime.rs
parents 9f91dd6c 658763d2
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