diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-01-25 23:42:58 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-01-25 23:42:58 +0800 |
| commit | 71d68f975cd7bc089f0cbef4e5888a73eab4ee42 (patch) | |
| tree | 9482602fc23d2baec3fff1fb97750ad45adc6eca /packages/website/public/images/team | |
| parent | ec3d8a034fe763d8255935985b1fb97aff6c177b (diff) | |
| parent | f58f0ddb67555c3f0c7252ea3e003824984c48ad (diff) | |
| download | dexon-0x-contracts-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar.gz dexon-0x-contracts-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar.zst dexon-0x-contracts-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.zip | |
Merge branch 'development' into feature/portal-ledger-support
* development: (437 commits)
Publish
Update yarn.lock
Update the CHANGELOG
Fix the bug making it impossible to specify the custom ZRX address
Fix fill/cancel order by looking for NoError instead of empty blockchainErr given the BlockchainErrs type refactor
Add a comment about a yarn bug
Add our mainnet and kovan nodes as backups for Portal requests
Fix bug hiding the user info from topBar
Add dev-utils package to top level README
Prettier newline
Prettier
Allow Token symbols to be alphanumeric
Update CHANGELOG, rebase on development
Should not -> cannot
Reject negative amounts in isValidBaseUnitAmount
Re-add changelog for 0x.js
Fix prettier
Update yarn.lock
Move tests to a separate folder
Change file layout
...
# Conflicts:
# packages/website/README.md
Diffstat (limited to 'packages/website/public/images/team')
| -rw-r--r-- | packages/website/public/images/team/jacob.jpg | bin | 0 -> 1177087 bytes |
| -rw-r--r-- | packages/website/public/images/team/tom.jpg | bin | 0 -> 41810 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/packages/website/public/images/team/jacob.jpg b/packages/website/public/images/team/jacob.jpg Binary files differnew file mode 100644 index 000000000..62ff412d2 --- /dev/null +++ b/packages/website/public/images/team/jacob.jpg diff --git a/packages/website/public/images/team/tom.jpg b/packages/website/public/images/team/tom.jpg Binary files differnew file mode 100644 index 000000000..a6b763816 --- /dev/null +++ b/packages/website/public/images/team/tom.jpg |
