merge development

2018-05-21 13:38:12 -07:00
parent c70540e7f4 a26cc7c14d
commit 0fdf32cf6f
87 changed files with 125 additions and 45 deletions
--- a/packages/contracts/test/asset_proxy/authorizable.ts
+++ b/packages/contracts/test/asset_proxy/authorizable.ts
@@ -1,6 +1,7 @@
 import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
+import 'make-promises-safe';
 import * as Web3 from 'web3';

 import { MixinAuthorizableContract } from '../../src/contract_wrappers/generated/mixin_authorizable';