Merge branch 'update-scheduler' of https://github.com/xlc/polkadot into xlc-update-scheduler

This commit is contained in:
Gav Wood committed 2020-07-02 15:06:11 +02:00
commit 393c4bffe4
4 files changed
+35 -4

No files matched your search

+1 -1
View File
@@ -333,7 +333,7 @@ pub trait Trait: CreateSignedTransaction<Call<Self>> + attestations::Trait + ses
}
/// Origin for the parachains module.
#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Eq, Clone, Encode, Decode)]
#[cfg_attr(feature = "std", derive(Debug))]
pub enum Origin {
/// It comes from a parachain.