diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-18 20:51:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 20:51:24 +0800 |
| commit | 857bd24c6db8ffd5353c20d0bd4b1c1fa29612ba (patch) | |
| tree | 5b2394a3d4098d3b07df8f69ef797a77893ad7be /packages/website | |
| parent | ab6bf6edc70d6bfd27cdb7becce838dda8720e39 (diff) | |
| parent | 904968cf4a899642d3f4e78abc53352125e17447 (diff) | |
| download | dexon-0x-contracts-857bd24c6db8ffd5353c20d0bd4b1c1fa29612ba.tar dexon-0x-contracts-857bd24c6db8ffd5353c20d0bd4b1c1fa29612ba.tar.gz dexon-0x-contracts-857bd24c6db8ffd5353c20d0bd4b1c1fa29612ba.tar.bz2 dexon-0x-contracts-857bd24c6db8ffd5353c20d0bd4b1c1fa29612ba.tar.lz dexon-0x-contracts-857bd24c6db8ffd5353c20d0bd4b1c1fa29612ba.tar.xz dexon-0x-contracts-857bd24c6db8ffd5353c20d0bd4b1c1fa29612ba.tar.zst dexon-0x-contracts-857bd24c6db8ffd5353c20d0bd4b1c1fa29612ba.zip | |
Merge branch 'v2-prototype' into feature/order-watcher-v2
Diffstat (limited to 'packages/website')
| -rw-r--r-- | packages/website/ts/pages/about/about.tsx | 16 | ||||
| -rw-r--r-- | packages/website/ts/utils/constants.ts | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index be4a67cb3..33581c938 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -181,14 +181,14 @@ const teamRow6: ProfileInfo[] = [ image: 'images/team/peter.jpg', linkedIn: 'https://www.linkedin.com/in/peter-z-7b9595163/', }, - // { - // name: 'Chris Kalani', - // title: 'Director of Design', - // description: `Previously founded Wake (acquired by InVision). Early Facebook product designer.`, - // image: 'images/team/chris.png', - // linkedIn: 'https://www.linkedin.com/in/chriskalani/', - // github: 'https://github.com/chriskalani', - // }, + { + name: 'Chris Kalani', + title: 'Director of Design', + description: `Previously founded Wake (acquired by InVision). Early Facebook product designer.`, + image: 'images/team/chris.png', + linkedIn: 'https://www.linkedin.com/in/chriskalani/', + github: 'https://github.com/chriskalani', + }, ]; const advisors: ProfileInfo[] = [ diff --git a/packages/website/ts/utils/constants.ts b/packages/website/ts/utils/constants.ts index e43f541bf..20441cd75 100644 --- a/packages/website/ts/utils/constants.ts +++ b/packages/website/ts/utils/constants.ts @@ -58,7 +58,7 @@ export const constants = { PROJECT_URL_MAKER: 'https://makerdao.com', PROJECT_URL_ARAGON: 'https://aragon.one', PROJECT_URL_BLOCKNET: 'https://blocknet.co', - PROJECT_URL_0CEAN: 'http://the0cean.com', + PROJECT_URL_0CEAN: 'https://theocean.trade', PROJECT_URL_IMTOKEN: 'https://tokenlon.token.im/', PROJECT_URL_AUGUR: 'https://augur.net', PROJECT_URL_AUCTUS: 'https://auctus.org', |