Jaco Greeff 8798ed4499 Merge branch 'master' into ui-2		2017-06-28 14:27:25 +02:00
..
ethereum	Merge branch 'master' into ui-2	2017-06-21 11:15:29 +02:00
authority_round.json	PoA: Wait for transition finality before applying (#5774)	2017-06-28 13:17:36 +02:00
basic_authority.json	Validator/authority contract (#3937)	2017-01-10 12:23:59 +01:00
constructor.json	Allow contract constructors in chain spec (#3932)	2016-12-23 18:44:39 +01:00
instant_seal.json	Add registrar fields (#4716)	2017-03-02 12:25:55 +01:00
null_morden.json	make spec naming consistent	2016-12-19 14:15:39 +01:00
null.json	EIP-86 (#4697)	2017-04-19 14:30:00 +02:00
tendermint.json	Fix validator contract syncing (#4789)	2017-03-08 14:41:24 +01:00
validator_contract.json	PoA: Wait for transition finality before applying (#5774)	2017-06-28 13:17:36 +02:00
validator_multi.json	Switching ValidatorSet (#4961)	2017-03-23 13:19:28 +01:00
validator_safe_contract.json	ValidatorSet reporting (#4208)	2017-01-24 12:03:58 +03:00