Carl Beekhuizen 26afa077fd Resolves conflicts and merges in dev

2019-04-18 23:17:53 +02:00

..

test_process_attestation.py

Merge branch 'dev' into prev-cur-crosslinks

2019-04-17 20:27:25 -06:00

test_process_attester_slashing.py

Merge branch 'dev' into start-at-zero

2019-04-17 08:39:25 -06:00

test_process_block_header.py

Move pytests for faster dev iteration

2019-04-17 17:47:56 +10:00

test_process_deposit.py

Merge branch 'dev' into carl-patch-1

2019-04-17 11:18:29 -06:00

test_process_proposer_slashing.py

Merge branch 'dev' into prev-cur-crosslinks

2019-04-17 08:33:13 -06:00

test_process_transfer.py

Fixes tests

2019-04-18 12:35:22 +02:00

test_voluntary_exit.py

Move pytests for faster dev iteration

2019-04-17 17:47:56 +10:00