diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-10 23:08:07 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-10 23:08:07 +0800 |
| commit | cd5f00ac4d41221c99eb8ce767e63e09a6de6a11 (patch) | |
| tree | 2b1865b5fa6ef86965ea753c032ffaba48403921 /.gitignore | |
| parent | 23c4027c83b9f30fad352615386b988084f8b39f (diff) | |
| parent | c64ad1af28ef116e210aafb3ea6ad2138361cd7c (diff) | |
| download | dexon-0x-contracts-cd5f00ac4d41221c99eb8ce767e63e09a6de6a11.tar.gz dexon-0x-contracts-cd5f00ac4d41221c99eb8ce767e63e09a6de6a11.tar.zst dexon-0x-contracts-cd5f00ac4d41221c99eb8ce767e63e09a6de6a11.zip | |
Merge branch 'development' into breakUp0xjs
* development: (38 commits)
Add fallback image support to relayer grid tile
Clear relayer grid state when fetching
Configure the compiler to generate artifacts with deployedBytecode
Implement loading and error state for relayer grid
Fallback image for relayer grid tile
Change relayer grid tile to link on header
Display top tokens from backend
Remove overflowZ property from portal
Suggestions and fix bad merge
Fix typo
Only show untracked tokens
Make wallet scrollable
Add token flow
Update The Ocean logo
Fix artifacts paths
Create an artifacts folder
Introduce a var
Add removeHexPrefix util method
CHeck if ABI exists
Improve the readability of the check for should compile
...
# Conflicts:
# .gitignore
# packages/contracts/test/multi_sig_with_time_lock.ts
# packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
# packages/contracts/util/artifacts.ts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index e798e3a0a..ab90e9e17 100644 --- a/.gitignore +++ b/.gitignore @@ -79,7 +79,7 @@ packages/metacoin/artifacts packages/0x.js/test/artifacts packages/order-watcher/test/artifacts packages/contract-wrappers/test/artifacts -packages/migrations/src/artifacts +packages/migrations/artifacts # generated contract wrappers packages/0x.js/src/contract_wrappers/generated/ |