Merge development

2019-01-28 17:26:13 +01:00
parent 0c12128f64 25e42c0ad4
commit 141ac0ca0b
280 changed files with 1876 additions and 1411 deletions
--- a/contracts/multisig/compiler.json
+++ b/contracts/multisig/compiler.json
@@ -19,5 +19,11 @@
            }
        }
    },
-    "contracts": ["MultiSigWallet", "MultiSigWalletWithTimeLock", "TestRejectEther"]
+    "contracts": [
+        "AssetProxyOwner",
+        "MultiSigWallet",
+        "MultiSigWalletWithTimeLock",
+        "TestAssetProxyOwner",
+        "TestRejectEther"
+    ]
 }