aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add menuBrandon Millman2018-05-182-20/+41
* Add routesBrandon Millman2018-05-181-2/+105
* Update yarn.lockFabio Berger2018-05-171-15/+3
* Merge branch 'development' into v2-prototypeFabio Berger2018-05-16236-1184/+2191
|\
| * Do not remove artifacts when running `clean`Fabio Berger2018-05-161-1/+1
| * Merge pull request #593 from 0xProject/bug/website/fix-cirular-dependencyFrancesco Agosti2018-05-163-11/+13
| |\
| | * fix style errorsfragosti2018-05-162-2/+2
| | * Fix circular dependencyfragosti2018-05-163-11/+13
| * | Merge pull request #592 from 0xProject/feature/website/add-francesco-aboutFrancesco Agosti2018-05-162-3/+11
| |\ \ | | |/ | |/|
| | * Add my profile image to imagesfragosti2018-05-161-0/+0
| | * Add myself to about pagefragosti2018-05-161-3/+11
| * | Add dogfood configs to websiteBrandon Millman2018-05-164-2/+10
| |/
| * Merge pull request #578 from 0xProject/document-node-versionAlex Browne2018-05-1629-6/+86
| |\
| | * Change minimum Node version to 6.12Alex Browne2018-05-1530-38/+38
| | * Document Node.js version requirement and add it to package.jsonAlex Browne2018-05-1530-15/+95
| * | Merge pull request #588 from 0xProject/improvement/use-wsrunFabio Berger2018-05-1573-469/+367
| |\ \
| | * | Revert to lerna:run lintFabio Berger2018-05-152-1/+2
| | * | Do lint sequentiallyFabio Berger2018-05-151-1/+1
| | * | Exclude monorepo-scripts from tslint as testFabio Berger2018-05-151-1/+1
| | * | Fix prettierFabio Berger2018-05-152-2/+14
| | * | Merge developmentFabio Berger2018-05-155-16/+54
| | |\ \ | | |/ / | |/| |
| * | | Add hover state to top tokensBrandon Millman2018-05-151-10/+43
| * | | Change to weekly txn volumeBrandon Millman2018-05-152-4/+4
| | |/ | |/|
| * | Merge pull request #590 from 0xProject/fix-prettierAlex Browne2018-05-152-2/+7
| |\ \
| | * | Apply prettier to some files which were not formatted correctlyAlex Browne2018-05-152-2/+7
| |/ /
| * | Fix TSLint issuesFabio Berger2018-05-159-19/+28
| | * Merge branch 'development' into improvement/use-wsrunFabio Berger2018-05-152-54/+986
| | |\ | | |/ | |/|
| * | Update ethereeumjs-testrpc to ganache-cliLeonid Logvinov2018-05-152-63/+986
| | * Fix TSLint issuesFabio Berger2018-05-159-19/+28
| | * Fix infinite loopFabio Berger2018-05-151-3/+3
| | * Add changelog entries for packages where executable binary exporting fixedFabio Berger2018-05-153-0/+27
| | * Rename bin to server in testnet-faucets since bin is no longer gitignoredFabio Berger2018-05-154-6/+8
| | * Fix sra-report binaryFabio Berger2018-05-152-1/+3
| | * rename build:watch to watch and remove build from docs:stageFabio Berger2018-05-151-2/+2
| | * Fix sol-compiler binary so it can be called directly from packagesFabio Berger2018-05-155-4/+6
| | * Fix abi-gen binary so it can be called directly from packagesFabio Berger2018-05-1510-11/+17
| | * Remove build from docs:stage commandsFabio Berger2018-05-157-7/+7
| | * Move from using lerna multi-package commands to wsrun, update README's accord...Fabio Berger2018-05-1563-449/+286
| |/
| * Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-05-14153-600/+655
| |\
| | * Merge pull request #585 from 0xProject/feature/typedefLeonid Logvinov2018-05-14153-600/+655
| | |\
| | | * Add missing type definitionsLeonid Logvinov2018-05-14153-600/+655
| | |/
| * / Remove tslint-config as dep to monorepo-scripts to avoid circular dependency....Fabio Berger2018-05-142-2/+1
| |/
* | Do not remove artifacts when running `clean`Fabio Berger2018-05-161-1/+1
* | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-16418-9053/+26371
|\|
| * Merge pull request #579 from 0xProject/breakUp0xjsFabio Berger2018-05-12172-1420/+16417
| |\
| | * Add missing .gitkeepsFabio Berger2018-05-122-0/+0
| | * Revert "Remove gitkeeps"Fabio Berger2018-05-1213-0/+0
| | * improve wordingFabio Berger2018-05-121-1/+1
| | * Remove gitkeepsFabio Berger2018-05-1113-0/+0
| | * Create coverage dir if doesn't existFabio Berger2018-05-112-0/+8
| | * Add compilerSettings to compiler.jsonFabio Berger2018-05-111-1/+14
| | * Add deployedBytecode to artifacts since it is needed by sol-covFabio Berger2018-05-1114-56/+140
| | * Revert throw conditions since it messes with the expected test timingFabio Berger2018-05-111-15/+3
| | * Revert back to hack, we need the configured web3WrapperFabio Berger2018-05-111-6/+7
| | * Add comment to TransactionReceiptWithDecodedLogs explaining that it doesn't a...Fabio Berger2018-05-111-0/+5
| | * Get rid of hackFabio Berger2018-05-111-7/+6
| | * Get networkId from web3WrapperFabio Berger2018-05-112-3/+3
| | * Throw if tx revertsFabio Berger2018-05-111-3/+15
| | * Remove unused methods and importsFabio Berger2018-05-112-31/+1
| | * Prettier ignore artifact filesFabio Berger2018-05-111-0/+2
| | * Add compiler depFabio Berger2018-05-111-0/+1
| | * Update yarn.lockFabio Berger2018-05-111-22/+0
| | * Fix versionFabio Berger2018-05-112-2/+2
| | * remove unused modulesFabio Berger2018-05-112-36/+0
| | * Fix depsFabio Berger2018-05-112-2/+2
| | * Fix prettierFabio Berger2018-05-114-10/+8
| | * Update artifactsFabio Berger2018-05-1124-7657/+5961
| | * Update yarn.lockFabio Berger2018-05-111-0/+22
| | * Update global_hooksFabio Berger2018-05-112-6/+28
| | * Remove legacy testFabio Berger2018-05-111-75/+0
| | * Merge branch 'development' into breakUp0xjsFabio Berger2018-05-11119-1108/+923
| | |\ | | |/ | |/|
| * | Merge pull request #574 from 0xProject/feature/rm-rf-deployerLeonid Logvinov2018-05-11129-1206/+890
| |\ \
| | * | Fix ganache subprovider configLeonid Logvinov2018-05-113-2/+5
| | * | Fix a bug in compiler config precedenceLeonid Logvinov2018-05-111-2/+4
| | * | Fix linter errorsLeonid Logvinov2018-05-1112-12/+12
| | * | Fix templatesLeonid Logvinov2018-05-107-7/+8
| | * | Remove unused deployer docs configsLeonid Logvinov2018-05-1030-130/+120
| | * | Add a legacy endpoint for the deployerLeonid Logvinov2018-05-102-0/+5
| | * | Add a check for compiler outputLeonid Logvinov2018-05-103-2/+4
| | * | Add a commentLeonid Logvinov2018-05-101-0/+2
| | * | Put ARTIFACTS_VERSION in a configLeonid Logvinov2018-05-102-1/+2
| | * | Improve a commentLeonid Logvinov2018-05-101-21/+21
| | * | Remove _applyDefaultsToDeployTxDataAsyncLeonid Logvinov2018-05-104-25/+13
| | * | Add a HACK commentLeonid Logvinov2018-05-101-0/+2
| | * | Fix linter issuesLeonid Logvinov2018-05-1049-183/+119
| | * | Rename deployer to sol-compilerLeonid Logvinov2018-05-1066-179/+142
| | * | Remove deployerLeonid Logvinov2018-05-1010-549/+16
| | * | Remove deployer from 0x.js and migrationsLeonid Logvinov2018-05-1011-58/+161
| | * | Configure migrations with a compiler.jsonLeonid Logvinov2018-05-103-6/+23
| | * | Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-1028-204/+406
| * | | Merge pull request #580 from 0xProject/feature/website/remove-tokensBrandon Millman2018-05-112-12/+69
| |\ \ \ | | |/ / | |/| |
| | * | Update wallet footer and add remove token functionalityBrandon Millman2018-05-102-12/+69
| | | * Add missing version directory to pathFabio Berger2018-05-112-2/+2
| | | * Add artifacts to clean commandFabio Berger2018-05-118-8/+8
| | | * Remove unnecessary compile commandFabio Berger2018-05-111-1/+0
| | | * Standardize gitignores and remove `migrations/artifacts`Fabio Berger2018-05-111-7/+6
| | | * Commit v1 artifacts to migrations package and remove compile step from prebuildFabio Berger2018-05-1126-1/+7686
| | | * Replace mkdir with mkdirp so it also created any missing intermediate directo...Fabio Berger2018-05-114-3/+6
| | | * Fix path to artifactsFabio Berger2018-05-112-2/+2
| | | * Fix tslint errorsFabio Berger2018-05-102-2/+2
| | | * Add missing DummyTokenFabio Berger2018-05-101-1/+1
| | | * Merge branch 'development' into breakUp0xjsFabio Berger2018-05-1046-509/+983
| | | |\ | | |_|/ | |/| |
| * | | Add fallback image support to relayer grid tileBrandon Millman2018-05-101-2/+36
| * | | Clear relayer grid state when fetchingBrandon Millman2018-05-101-0/+6
| |/ /
| * | Configure the compiler to generate artifacts with deployedBytecodeLeonid Logvinov2018-05-102-1/+19
| * | Implement loading and error state for relayer gridBrandon Millman2018-05-101-10/+50
| * | Fallback image for relayer grid tileBrandon Millman2018-05-102-2/+3
| * | Change relayer grid tile to link on headerBrandon Millman2018-05-101-17/+17
| * | Merge pull request #576 from 0xProject/feature/website/top-tokensBrandon Millman2018-05-093-41/+17
| |\ \
| | * | Display top tokens from backendBrandon Millman2018-05-093-41/+17
| * | | Merge pull request #557 from 0xProject/feature/website/top-bar-redesignBrandon Millman2018-05-094-56/+57
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'development' into feature/website/top-bar-redesignBrandon Millman2018-05-094-79/+92
| | |\ \ | | |/ / | |/| |
| * | | Remove overflowZ property from portalBrandon Millman2018-05-091-1/+0
| * | | Merge pull request #570 from 0xProject/feature/website/wallet-add-tokensBrandon Millman2018-05-094-79/+92
| |\ \ \
| | * | | Fix typoBrandon Millman2018-05-091-1/+1
| | * | | Only show untracked tokensBrandon Millman2018-05-091-1/+1
| | * | | Make wallet scrollableBrandon Millman2018-05-091-9/+48
| | * | | Add token flowBrandon Millman2018-05-094-69/+43
| |/ / /
| | * | Suggestions and fix bad mergeBrandon Millman2018-05-092-21/+6
| | * | Merge branch 'development' into feature/website/top-bar-redesignBrandon Millman2018-05-09171-6159/+2597
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #556 from 0xProject/feature/website/portal-v2Brandon Millman2018-05-093-3/+326
| |\ \ \
| | * | | Add headers to wallet and relayer indexBrandon Millman2018-05-052-2/+12
| | * | | Add scrolling to relayer indexBrandon Millman2018-05-052-2/+8
| | * | | Lay out wallet and relayersBrandon Millman2018-05-053-3/+310
| * | | | Update The Ocean logoFabio Berger2018-05-081-0/+0
| * | | | Merge pull request #537 from 0xProject/feature/artifacts-v2Leonid Logvinov2018-05-0731-305/+368
| |\ \ \ \
| | * | | | Fix artifacts pathsLeonid Logvinov2018-05-074-5/+5
| | * | | | Create an artifacts folderLeonid Logvinov2018-05-071-0/+0
| | * | | | Introduce a varLeonid Logvinov2018-05-071-2/+4
| | * | | | Add removeHexPrefix util methodLeonid Logvinov2018-05-072-6/+6
| | * | | | CHeck if ABI existsLeonid Logvinov2018-05-071-0/+6
| | * | | | Improve the readability of the check for should compileLeonid Logvinov2018-05-073-6/+7
| | * | | | Use named constantsLeonid Logvinov2018-05-071-3/+6
| | * | | | Add a commentLeonid Logvinov2018-05-071-0/+3
| | * | | | Fix commentsLeonid Logvinov2018-05-071-2/+2
| | * | | | Rename args to constructor-argsLeonid Logvinov2018-05-071-2/+2
| | * | | | Fix a typoLeonid Logvinov2018-05-071-1/+1
| | * | | | Define a separator constLeonid Logvinov2018-05-072-4/+5
| | * | | | Move artifacts from src/artifacts to artifacts/v1Leonid Logvinov2018-05-072-2/+2
| | * | | | Fix sol-cov to work with the new artifacts formatLeonid Logvinov2018-05-072-25/+30
| | * | | | Implement new artifacts formatLeonid Logvinov2018-05-0724-271/+313
| |/ / / /
| | | * | ProviderDisplay changesBrandon Millman2018-04-242-37/+28
| | | * | Top bar expanded display typeBrandon Millman2018-04-242-17/+33
| | | * | Relayer grid spacing tweaksBrandon Millman2018-04-241-2/+2
| | | * | Add headers to wallet and relayer indexBrandon Millman2018-04-242-2/+12
| | | * | Add scrolling to relayer indexBrandon Millman2018-04-242-2/+8
| | | * | Lay out wallet and relayersBrandon Millman2018-04-243-3/+310
| | | | * Add missing uuid typesFabio Berger2018-05-101-0/+1
| | | | * Fix type error for latched on propertyFabio Berger2018-05-101-1/+1
| | | | * Add generated contracts in contract-wrappers to gitignoreFabio Berger2018-05-101-0/+1
| | | | * Rename zeroExContract... to contractWrappers...Fabio Berger2018-05-108-17/+17
| | | | * Update yarn.lockFabio Berger2018-05-101-24/+1
| | | | * Add missing quoteFabio Berger2018-05-109-9/+9
| | | | * Add PR numberFabio Berger2018-05-102-2/+4
| | | | * Remove provider instance variableFabio Berger2018-05-101-10/+7
| | | | * Add var returnsFabio Berger2018-05-103-8/+14
| | | | * Remove unneeded tslint disableFabio Berger2018-05-102-3/+0
| | | | * Remove uneeded tslint configFabio Berger2018-05-109-9/+9
| | | | * Remove generated contract wrappersFabio Berger2018-05-106-3842/+0
| | | | * Remove extra tslint configFabio Berger2018-05-102-2/+2
| | | | * Improve createOrderWatcherAsyncFabio Berger2018-05-101-4/+5
| | | | * Fix no-any-propagationFabio Berger2018-05-102-3/+4
| | | | * Remove unnecessary tslint configFabio Berger2018-05-107-7/+7
| | | | * Add pr number to changelogsFabio Berger2018-05-104-5/+12
| | | | * Fix website and 0x.js docsFabio Berger2018-05-104-40/+41
| | | | * Remove last artifactFabio Berger2018-05-101-39/+0
| | | | * Remove artifactsFabio Berger2018-05-1013-5490/+0
| | | | * Fix package.jsonFabio Berger2018-05-101-1/+1
| | | | * Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a unifyin...Fabio Berger2018-05-10168-1350/+19671
| | |_|/ | |/| |
| * | | Publishcontracts@2.1.28@0xproject/website@0.0.32@0xproject/testnet-faucets@1.0.29@0xproject/sra-report@0.0.14@0xproject/sol-resolver@0.0.4@0xproject/react-docs-example@0.0.11@0xproject/migrations@0.0.5@0xproject/metacoin@0.0.6@0xproject/dev-utils@0.4.1@0xproject/base-contract@0.3.1Leonid Logvinov2018-05-0525-130/+130
| * | | Updated CHANGELOGSLeonid Logvinov2018-05-0540-0/+260
| * | | Make node types a dependencyLeonid Logvinov2018-05-051-1/+1
| * | | Fix type errors in CSS propertiesLeonid Logvinov2018-05-053-3/+3
| * | | Use a single version of react typesLeonid Logvinov2018-05-051-5/+1
| * | | Revert yarn.lock changesLeonid Logvinov2018-05-051-666/+585
| * | | Publish@0xproject/website@0.0.31@0xproject/react-docs@0.0.10@0xproject/react-docs-example@0.0.10Leonid Logvinov2018-05-054-8/+8
| * | | Updated CHANGELOGSLeonid Logvinov2018-05-054-0/+26
| * | | Fix property nameLeonid Logvinov2018-05-052-584/+675
| * | | Upgrade react types versionLeonid Logvinov2018-05-055-5104/+4
| * | | Publishcontracts@2.1.27@0xproject/website@0.0.30@0xproject/testnet-faucets@1.0.28@0xproject/sra-report@0.0.13Leonid Logvinov2018-05-056-11/+11
| * | | Updated CHANGELOGSLeonid Logvinov2018-05-056-0/+39
| |/ /
| * | Make a negligible change to order-utils to publish a new versionLeonid Logvinov2018-05-052-1/+21
| * | Publishcontracts@2.1.26@0xproject/website@0.0.29@0xproject/testnet-faucets@1.0.27@0xproject/sra-report@0.0.12@0xproject/sol-resolver@0.0.3@0xproject/react-docs-example@0.0.9@0xproject/monorepo-scripts@0.1.19@0xproject/migrations@0.0.4@0xproject/metacoin@0.0.5@0xproject/dev-utils@0.4.0@0xproject/base-contract@0.3.0Leonid Logvinov2018-05-0427-180/+180
| * | Updated CHANGELOGSLeonid Logvinov2018-05-0444-89/+330
| * | Add order utils docs to the menuLeonid Logvinov2018-05-048-13/+20
| * | Open relayer app when clicking on grid tileBrandon Millman2018-05-042-16/+20
| * | Add header images to relayer grid tilesBrandon Millman2018-05-042-4/+7
| * | Fix logo left padding on mobileFabio Berger2018-05-031-1/+1
| * | Add new section to homepageFabio Berger2018-05-032-0/+26
| * | Remove id property from WebsiteBackendRelayerInfoBrandon Millman2018-05-032-2/+1
| * | Add order-utils to monorepo-scriptsLeonid Logvinov2018-05-031-0/+1
| * | Merge pull request #559 from 0xProject/feature/order-utilsLeonid Logvinov2018-05-0347-370/+934
| |\ \
| | * | Fix signature utils testsLeonid Logvinov2018-05-031-15/+22
| | * | Stop exporting assertions from order-utilsLeonid Logvinov2018-05-0211-17/+40
| | * | Create wrapper functions so that docs render properlyLeonid Logvinov2018-05-022-29/+38
| | * | Move order utils to @0xproject/order-utilsLeonid Logvinov2018-05-0252-395/+920
| |/ /
| * | Add Greg and Remco to the about pageBrandon Millman2018-05-024-1/+23
| * | Merge pull request #550 from 0xProject/feature/website/crypto-compare-pricesBrandon Millman2018-05-025-62/+73
| |\ \
| | * | Remove WETH special case, website backend handles this nowBrandon Millman2018-05-011-6/+2
| | * | Hit website backend for price informationBrandon Millman2018-05-014-49/+12
| | * | Style suggestionsBrandon Millman2018-04-281-15/+10
| | * | Move quote currency string into configBrandon Millman2018-04-282-3/+3
| | * | yarn.lockBrandon Millman2018-04-281-6/+6
| | * | Merge branch 'development' into feature/website/crypto-compare-pricesBrandon Millman2018-04-2727-85/+394
| | |\ \
| | * | | Rename baseCurrency to quoteCurrencyBrandon Millman2018-04-231-3/+3
| | * | | Remove some unused importsBrandon Millman2018-04-231-2/+1
| | * | | Rate limit crypto compare callsBrandon Millman2018-04-231-3/+25
| | * | | Refactor common fetch logic into fetch_utilsBrandon Millman2018-04-233-56/+62
| | * | | Grab price information from crypto compare apiBrandon Millman2018-04-232-8/+38
| * | | | Merge pull request #568 from 0xProject/bug/0x.js/trade-simulator-trading-zrxJacob Evans2018-05-013-23/+46
| |\ \ \ \
| | * | | | Update comment to be more descriptive of null address in exchange simulatorJacob Evans2018-05-011-1/+3
| | * | | | Execute taker side in trade simulationJacob Evans2018-05-013-23/+44
| | | |/ / | | |/| |
| * | | | Merge pull request #564 from 0xProject/add-code-of-conduct-1Brandon Millman2018-05-011-0/+46
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | PrettierBrandon Millman2018-04-281-10/+10
| | * | | Create CODE_OF_CONDUCT.mdBrandon Millman2018-04-281-0/+46
| |/ / /
| * | | Merge pull request #555 from 0xProject/feature/subproviders/upgrade-provider-...Jacob Evans2018-04-2611-19/+189
| |\ \ \
| | * | | Update Web3 Provider Engine to 14.0.4Jacob Evans2018-04-2411-19/+189
| | | |/ | | |/|
| * | | Fix react type versions to avoid minor version bumps with breaking changesFabio Berger2018-04-245-5/+5
| * | | Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-04-245-24/+26
| |\| |
| | * | Merge pull request #552 from 0xProject/refactor/website/legacy-portalBrandon Millman2018-04-245-24/+26
| | |\ \
| | | * | Fix lazy load component nameBrandon Millman2018-04-241-2/+2
| | | * | Rename Portal and PortalMenu components to LegacyPortal and LegacyPortalMenuBrandon Millman2018-04-245-23/+25
| | | |/
| * | / Remove auto-assignment of everyone to PR'sFabio Berger2018-04-241-1/+0
| |/ /
| * | Check for Yarn instead of npmFabio Berger2018-04-241-4/+4
| * | Merge pull request #541 from 0xProject/improveMonorepoScriptsFabio Berger2018-04-247-36/+174
| |\ \ | | |/ | |/|
| | * Add hack comment about the use of sudoFabio Berger2018-04-241-0/+2
| | * Remove unnecessary additional paramsFabio Berger2018-04-201-1/+1
| | * Remove outside declarationFabio Berger2018-04-201-2/+1
| | * Capitalize yarnFabio Berger2018-04-201-1/+1
| | * Use path for platform independenceFabio Berger2018-04-201-1/+1
| | * Consolidate github personal access token env to one place: constants.tsFabio Berger2018-04-203-3/+3
| | * Use methods moved to utils since now shared by multiple scriptsFabio Berger2018-04-191-33/+3
| | * Add commentFabio Berger2018-04-191-0/+2
| | * Improve commentsFabio Berger2018-04-191-4/+5
| | * Add checks for the required local setup before running the publish scriptFabio Berger2018-04-191-0/+50
| | * Add descriptions for all commands in monorepo-scriptsFabio Berger2018-04-191-0/+10
| | * Add removeGitTags script that can be run after a failed Lerna publishFabio Berger2018-04-194-1/+105
* | | Merge pull request #546 from 0xProject/feature/contracts/solidity-0.4.23Amir Bandeali2018-05-0953-702/+1148
|\ \ \
| * | | Add revert variables, change lib => libs to get around gitignoreAmir Bandeali2018-05-0921-52/+325
| * | | Move Authorizable to AssetProxy dir, rename to MixinAuthorizableAmir Bandeali2018-05-0810-63/+97
| * | | Split up mixins and interfacesAmir Bandeali2018-05-0529-745/+508
| * | | Make LibBytes methods internal, add TestLibBytesAmir Bandeali2018-05-055-33/+180
| * | | Update contracts with revert reasons and constructor keywordAmir Bandeali2018-05-0342-181/+410
|/ / /
* | | Merge pull request #569 from 0xProject/feature/contracts/batchTransferAmir Bandeali2018-05-036-180/+446
|\ \ \
| * | | Add MixinAssetProxy to reuse redundant codeAmir Bandeali2018-05-034-98/+117
| * | | Add tests for batchTransferFromAmir Bandeali2018-05-021-151/+296
| * | | Add batchTransferFrom to asset proxiesAmir Bandeali2018-05-023-9/+111
|/ / /
* | | Merge pull request #563 from 0xProject/feature/contracts/proxyIdsAmir Bandeali2018-05-017-9/+78
|\ \ \
| * | | Remove outdated commentAmir Bandeali2018-05-012-4/+2
| * | | Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-016-5/+76
|/ / /