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
@@ -16,7 +16,8 @@
//! Staking manager: Handles balances and periodically determines the best set of validators.
use runtime_support::{Vec, RefCell};
use runtime_support::prelude::*;
use runtime_support::cell::RefCell;
use keyedvec::KeyedVec;
use storable::{Storable, StorageVec};
use primitives::{BlockNumber, AccountID};