Merge branch 'development' of https://github.com/0xProject/0x-monorepo into development

3 files changed, 9 insertions, 1 deletions

diff --git a/contracts/multisig/src/artifacts/index.ts b/contracts/multisig/src/artifacts/index.ts
index 7cf47be01..326d79000 100644
--- a/contracts/multisig/src/artifacts/index.ts
+++ b/contracts/multisig/src/artifacts/index.ts
@@ -1,11 +1,15 @@
 import { ContractArtifact } from 'ethereum-types';
 
+import * as AssetProxyOwner from '../../generated-artifacts/AssetProxyOwner.json';
 import * as MultiSigWallet from '../../generated-artifacts/MultiSigWallet.json';
 import * as MultiSigWalletWithTimeLock from '../../generated-artifacts/MultiSigWalletWithTimeLock.json';
+import * as TestAssetProxyOwner from '../../generated-artifacts/TestAssetProxyOwner.json';
 import * as TestRejectEther from '../../generated-artifacts/TestRejectEther.json';
 
 export const artifacts = {
-    TestRejectEther: TestRejectEther as ContractArtifact,
+    AssetProxyOwner: AssetProxyOwner as ContractArtifact,
     MultiSigWallet: MultiSigWallet as ContractArtifact,
     MultiSigWalletWithTimeLock: MultiSigWalletWithTimeLock as ContractArtifact,
+    TestAssetProxyOwner: TestAssetProxyOwner as ContractArtifact,
+    TestRejectEther: TestRejectEther as ContractArtifact,
 };
diff --git a/contracts/multisig/src/index.ts b/contracts/multisig/src/index.ts
index d55f08ea2..ba813e7ca 100644
--- a/contracts/multisig/src/index.ts
+++ b/contracts/multisig/src/index.ts
@@ -1,2 +1,3 @@
 export * from './artifacts';
 export * from './wrappers';
+export * from '../test/utils';
diff --git a/contracts/multisig/src/wrappers/index.ts b/contracts/multisig/src/wrappers/index.ts
index 69abd62f2..43ab25704 100644
--- a/contracts/multisig/src/wrappers/index.ts
+++ b/contracts/multisig/src/wrappers/index.ts
@@ -1,2 +1,5 @@
+export * from '../../generated-wrappers/asset_proxy_owner';
 export * from '../../generated-wrappers/multi_sig_wallet';
 export * from '../../generated-wrappers/multi_sig_wallet_with_time_lock';
+export * from '../../generated-wrappers/test_asset_proxy_owner';
+export * from '../../generated-wrappers/test_reject_ether';