Merge branch 'master' into gav-demo

This commit is contained in:
Gav
2018-03-02 14:59:32 +01:00
22 changed files with 574 additions and 66 deletions
+1 -1
View File
@@ -18,7 +18,7 @@
#![cfg_attr(not(feature = "std"), no_std)]
extern crate substrate_runtime_std as rstd;
#[macro_use] extern crate substrate_runtime_std as rstd;
#[macro_use] extern crate substrate_runtime_io as runtime_io;
extern crate substrate_runtime_support as runtime_support;
#[cfg(all(feature = "std", test))] extern crate substrate_keyring as keyring;