Fabio Berger c513a5a5bd Merge branch 'master' into addSignOrderHashAndTests ...

# Conflicts:
#	package.json
#	src/globals.d.ts
#	test/0x.js_test.ts

2017-05-29 16:06:04 +02:00

..

utils

improve comment

2017-05-26 18:08:50 +02:00

0x.js_test.ts

Merge branch 'master' into addSignOrderHashAndTests

2017-05-29 16:06:04 +02:00

contract_wrapper_test.ts

Use only 0x public interface in contract wrapper tests

2017-05-29 11:55:43 +02:00