diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-25 07:30:30 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-25 07:30:30 +0800 |
| commit | 35121f0b780102f0235ab3d5f26441cbb3f090e9 (patch) | |
| tree | 9f1e56a98683fbee69a6b5fc051dc81064643734 /.gitignore | |
| parent | 3cc8af819c9f62f42e7cb3d03f896b35cfc10d05 (diff) | |
| parent | c4a7574f7bd3939eac9417241144197bbb22edb1 (diff) | |
| download | dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.gz dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.bz2 dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.lz dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.xz dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.tar.zst dexon-sol-tools-35121f0b780102f0235ab3d5f26441cbb3f090e9.zip | |
Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash
* v2-prototype:
Temporarily disable installation tests
Pin connect in sra-report
Fix a typo
Pin types in sra-report
Fix linter issues
Unpin types version in @0xproject/connect
Pin types version in website
Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages
Migrate migrations to v2
# Conflicts:
# packages/contracts/src/utils/order_utils.ts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 5d0b845ce..96f562b1e 100644 --- a/.gitignore +++ b/.gitignore @@ -86,7 +86,8 @@ packages/contract-wrappers/src/contract_wrappers/generated/ packages/metacoin/src/contract_wrappers packages/fill-scenarios/src/generated_contract_wrappers/ packages/order-watcher/src/generated_contract_wrappers/ -packages/migrations/src/contract_wrappers +packages/migrations/src/v1/contract_wrappers +packages/migrations/src/v2/contract_wrappers # solc-bin in sol-compiler packages/sol-compiler/solc_bin/ |