Merge branch 'master' into staking

This commit is contained in:
Demi M. Obenour
2020-07-08 18:06:11 -04:00
10 changed files with 284 additions and 24 deletions
-2
View File
@@ -235,8 +235,6 @@ impl system::Trait for Runtime {
type OnKilledAccount = ();
/// The data to be stored in an account.
type AccountData = balances::AccountData<Balance>;
/// The base call filter.
type BaseCallFilter = ();
}
impl aura::Trait for Runtime {