2 Commits

Author SHA1 Message Date
Fabio Berger
62cc3b919c Merge branch 'master' of github.com:0xProject/0x.js
# Conflicts:
#	src/ts/0x.js.ts
#	src/ts/utils/utils.ts
2017-05-29 09:09:54 +02:00
Fabio Berger
3cf25d0787 Postfix test files with _test 2017-05-26 17:08:45 +02:00