Commit 9c431374 authored by Andrew Jones's avatar Andrew Jones

Merge branch 'master' into aj-update-scale-info

# Conflicts:
#	primitives/src/key.rs
parent a140dc9a
......@@ -23,15 +23,15 @@ use alloc::{
};
use core::marker::PhantomData;
use scale_info::{
meta_type,
form::{
CompactForm,
Form,
MetaForm,
},
meta_type,
IntoCompact,
TypeInfo,
Registry,
TypeInfo,
};
use serde::Serialize;
......
Markdown is supported
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