Pierre Krieger 89b312fe9c Revert #2745 (#2791) ...

* Revert #2745

* Fix error in merge resolve

* Fix compilation

2019-06-05 11:56:36 +02:00

..

doc

Minimal switch of substrate-node to GRANDPA /Aura (#1128)

2018-11-21 18:42:50 +01:00

res

node: set protocol id for flaming fir (#2589)

2019-05-15 18:14:52 +02:00

src

Revert #2745 (#2791)

2019-06-05 11:56:36 +02:00

build.rs

Update copyrights to 2019 (#1932)

2019-03-06 15:04:28 +01:00

Cargo.toml

Restore integration tests (#2620)

2019-06-05 09:16:14 +02:00