Leonid Logvinov 32867c9a07

Fix merge conflicts

2017-11-27 16:03:57 -06:00

..

utils

Remove unused asyncs

2017-11-23 15:13:38 -06:00

0x.js_test.ts

Pass networkId on provider update

2017-11-23 15:15:47 -06:00

artifacts_test.ts

Fix the imports order

2017-11-23 15:13:37 -06:00

assert_test.ts

Fix the imports order

2017-11-23 15:13:37 -06:00

ether_token_wrapper_test.ts

Fix the imports order

2017-11-23 15:13:37 -06:00

event_watcher_test.ts

Fix the imports order

2017-11-23 15:13:37 -06:00

exchange_transfer_simulator_test.ts

Fix merge conflicts

2017-11-27 16:03:57 -06:00

exchange_wrapper_test.ts

Merge branch 'development' into feature/passNetworkId

2017-11-27 15:53:21 -06:00

expiration_watcher_test.ts

Fix the imports order

2017-11-23 15:13:37 -06:00

order_state_watcher_test.ts

Merge branch 'development' into feature/passNetworkId

2017-11-27 15:53:21 -06:00

order_validation_test.ts

Fix merge conflicts

2017-11-27 16:03:57 -06:00

remaining_fillable_calculator_test.ts

Fix rebasing issues

2017-11-23 15:15:17 -06:00

subscription_test.ts

Add a regression test

2017-11-23 15:15:47 -06:00

token_registry_wrapper_test.ts

Fix the imports order

2017-11-23 15:13:37 -06:00

token_transfer_proxy_wrapper_test.ts

Fix the imports order

2017-11-23 15:13:37 -06:00

token_wrapper_test.ts

Merge branch 'development' into feature/passNetworkId

2017-11-27 15:53:21 -06:00