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

Merge commit '1f26179a' into alex-costruct-runtime-proc-macro 

# Conflicts:
#	bin/node/runtime/src/lib.rs
#	frame/support/src/lib.rs
#	frame/support/src/runtime.rs
parents fbfa34fa 1f26179a
Hide whitespace changes
Inline Side-by-side
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