Jaco Greeff 054a6a9daf Merge branch 'master' into check-updates ... # Conflicts: # .gitlab-ci.yml # js/webpack/dev.server.js		2016-12-15 13:52:28 +01:00
..
ethereum	Don't put sha3s.	2016-12-14 21:59:00 +01:00
authority_round.json	update specs and generic conversion	2016-12-14 12:50:32 +01:00
basic_authority.json	update specs and generic conversion	2016-12-14 12:50:32 +01:00
instant_seal.json	Merge pull request #3843 from ethcore/auth-round-seal	2016-12-15 13:08:50 +01:00
null_morden.json	Fix state not using "account_starting_nonce" (#1830)	2016-08-04 18:17:39 +02:00
null.json	Gas price statistics. (#1291)	2016-06-18 10:52:50 +02:00
tendermint.json	update genesis seal	2016-12-05 14:28:50 +00:00