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

Merge remote-tracking branch 'origin/master' into ser-putcode-model

# Conflicts:
#	srml/contract/src/lib.rs
parents 6d5e0aa7 50aa34fd
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