Fabio Berger 1443c0838c Merge branch 'master' into remainingTokenMethods ...

# Conflicts:
#	src/types.ts
#	src/web3_wrapper.ts

2017-06-02 19:45:57 +02:00

..

utils

Address feedback

2017-06-02 18:37:25 +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

Add includeStack config to chai setup so that we get stackTraces

2017-06-02 19:38:28 +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

Merge branch 'master' into remainingTokenMethods

2017-06-02 19:45:57 +02:00