Merge branch 'master' into governance

This commit is contained in:
Gav
2018-01-23 20:52:47 +01:00
22 changed files with 105 additions and 60 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ pub use support::{primitives, function, proposal, environment, storable};
#[cfg(test)]
pub use support::{testing, statichex};
use runtime_support::Vec;
use runtime_support::prelude::*;
use slicable::Slicable;
use primitives::{Block, UncheckedTransaction};