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

Merge commit 'e9db00f8' into alex-costruct-runtime-proc-macro

# Conflicts:
#	srml/support/src/runtime.rs
parents a06dc862 e9db00f8
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