Merge branch 'master' into extract-pre-runtime
There were merge conflicts that needed fixing.
Showing
- Cargo.lock 119 additions, 103 deletionsCargo.lock
- Cargo.toml 1 addition, 0 deletionsCargo.toml
- core/basic-authorship/Cargo.toml 1 addition, 1 deletioncore/basic-authorship/Cargo.toml
- core/client/Cargo.toml 2 additions, 2 deletionscore/client/Cargo.toml
- core/client/db/Cargo.toml 1 addition, 1 deletioncore/client/db/Cargo.toml
- core/client/src/call_executor.rs 6 additions, 2 deletionscore/client/src/call_executor.rs
- core/client/src/client.rs 5 additions, 1 deletioncore/client/src/client.rs
- core/client/src/error.rs 3 additions, 0 deletionscore/client/src/error.rs
- core/client/src/light/call_executor.rs 10 additions, 2 deletionscore/client/src/light/call_executor.rs
- core/consensus/aura/Cargo.toml 1 addition, 1 deletioncore/consensus/aura/Cargo.toml
- core/consensus/aura/primitives/Cargo.toml 1 addition, 1 deletioncore/consensus/aura/primitives/Cargo.toml
- core/consensus/babe/Cargo.toml 1 addition, 2 deletionscore/consensus/babe/Cargo.toml
- core/consensus/babe/primitives/Cargo.toml 1 addition, 1 deletioncore/consensus/babe/primitives/Cargo.toml
- core/consensus/common/Cargo.toml 1 addition, 1 deletioncore/consensus/common/Cargo.toml
- core/consensus/rhd/Cargo.toml 2 additions, 2 deletionscore/consensus/rhd/Cargo.toml
- core/consensus/slots/Cargo.toml 1 addition, 1 deletioncore/consensus/slots/Cargo.toml
- core/executor/Cargo.toml 1 addition, 1 deletioncore/executor/Cargo.toml
- core/executor/wasm/Cargo.lock 18 additions, 18 deletionscore/executor/wasm/Cargo.lock
- core/finality-grandpa/Cargo.toml 2 additions, 2 deletionscore/finality-grandpa/Cargo.toml
- core/finality-grandpa/primitives/Cargo.toml 1 addition, 1 deletioncore/finality-grandpa/primitives/Cargo.toml
Please register or sign in to comment