Merge branch 'master' into gav-demo

This commit is contained in:
Gav
2018-03-14 12:03:44 +01:00
36 changed files with 1191 additions and 227 deletions
+2 -1
View File
@@ -16,7 +16,7 @@
//! Transaction type.
use rstd::vec::Vec;
use rstd::prelude::*;
use codec::{Input, Slicable, NonTrivialSlicable};
use {AccountId, SessionKey};
@@ -75,6 +75,7 @@ impl InternalFunctionId {
}
}
/// A means of determining whether a referendum has gone through or not.
#[derive(Clone, Copy, PartialEq, Eq)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
pub enum VoteThreshold {