Skip to content
Commit fc726ffd 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/procedural/tools/src/syn_ext.rs
parents 7b98eab9 b7627c4c
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