Fabio Berger 36e937f8de Merge branch 'master' into remainingTokenMethods ...

# Conflicts:
#	src/contract_wrappers/token_wrapper.ts

2017-06-02 20:39:02 +02:00

..

utils

Merge branch 'master' into unavailableFilledCancelled

2017-06-02 19:03:53 +02:00

0x.js_test.ts

Add includeStack config to chai setup so that we get stackTraces

2017-06-02 19:38:28 +02:00

exchange_wrapper_test.ts

Merge pull request #31 from 0xProject/unavailableFilledCancelled

2017-06-02 19:53:01 +02:00

token_registry_wrapper_test.ts

Add includeStack config to chai setup so that we get stackTraces

2017-06-02 19:38:28 +02:00

token_wrapper_test.ts

Fix bug

2017-06-02 20:34:16 +02:00