Skip to content
Commit 6ef0cb91 authored by Gav Wood's avatar Gav Wood
Browse files

Merge remote-tracking branch 'origin/gav-new-sessions' into gav-new-sessions 

# Conflicts:
#	srml/aura/src/lib.rs
#	srml/grandpa/src/mock.rs
#	srml/support/test/tests/instance.rs
parents 0399856f 91a0495e
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment