aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Try relative pathFabio Berger2018-08-271-1/+1
* Fix commandFabio Berger2018-08-271-1/+1
* Move md files to lib folder during buildFabio Berger2018-08-272-2/+4
* Fix sra-spec `main` and `types` in package.jsonFabio Berger2018-08-271-2/+2
* Add BlockParamLiteral to templateFabio Berger2018-08-271-1/+1
* Remove check since this method is now used in multiple placesFabio Berger2018-08-271-5/+0
* Also use failure exit code if unexpected error occursFabio Berger2018-08-271-1/+3
* Change exit code to failureFabio Berger2018-08-271-1/+1
* Combine importsFabio Berger2018-08-271-2/+9
* Bumop 0x.js version0x.js@1.0.1-rc.5Fabio Berger2018-08-271-1/+1
* Fix file path to main and types in package.jsonFabio Berger2018-08-272-2/+11
* Merge pull request #986 from 0xProject/feature/contracts/assertionsAmir Bandeali2018-08-254-30/+117
|\
| * Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js int...Remco Bloemen2018-08-2532-300/+1081
| |\
| * | Revert maker not equal taker checkRemco Bloemen2018-08-251-6/+1
| * | Fix mixin apiRemco Bloemen2018-08-253-21/+36
| * | Fix double definition of errorRemco Bloemen2018-08-251-1/+0
| * | Split into assertFillable and assertValidFillRemco Bloemen2018-08-252-29/+43
| * | Disallow self fillingRemco Bloemen2018-08-251-1/+7
| * | Add revert reasons to typesRemco Bloemen2018-08-251-0/+5
| * | Remove BUG_ from revert reasonsRemco Bloemen2018-08-251-3/+3
| * | Document accetable price checkRemco Bloemen2018-08-251-2/+16
| * | Fix taker overpay checkRemco Bloemen2018-08-251-1/+1
| * | Check fillable earlyRemco Bloemen2018-08-251-0/+6
| * | Update for new assertValidFill signatureRemco Bloemen2018-08-252-5/+8
| * | Add overfill and price assertion to assertValidFillRemco Bloemen2018-08-252-2/+32
* | | Merge pull request #1008 from 0xProject/fix/contracts/robustMatchingAmir Bandeali2018-08-254-277/+848
|\ \ \ | |_|/ |/| |
| * | Added comments to order matchingGreg Hysen2018-08-251-1/+13
| * | Rephrased some of the math in MixinMatchOrders to improve readabilityGreg Hysen2018-08-251-3/+3
| * | Run all testsGreg Hysen2018-08-251-1/+1
| * | Give right maker better price when correct value is not integralGreg Hysen2018-08-251-10/+14
| * | Extract only `fill` event logsGreg Hysen2018-08-251-4/+5
| * | Added temporary @todo to MixinMatchOrdersGreg Hysen2018-08-251-4/+4
| * | Wording in MixinMatchOrdersGreg Hysen2018-08-251-2/+2
| * | Addressed linter errors in match order tessterGreg Hysen2018-08-251-9/+2
| * | Removed a redundant comment from matchOrdersGreg Hysen2018-08-251-5/+1
| * | Tests for matchOrders edge casesGreg Hysen2018-08-251-13/+71
| * | Swapped direction of `expect` values to match output in failure casesGreg Hysen2018-08-251-37/+26
| * | Renaming verify -> assert in order matchingGreg Hysen2018-08-252-53/+52
| * | Fixed a function commentGreg Hysen2018-08-251-1/+2
| * | Added function signature commentsGreg Hysen2018-08-253-239/+233
| * | Added `expect` messages for checking left/right order statesGreg Hysen2018-08-251-2/+6
| * | Ran prettier and linterGreg Hysen2018-08-253-224/+317
| * | Updated all existing match order tests to use new formatGreg Hysen2018-08-252-128/+301
| * | Passes comprehensive testGreg Hysen2018-08-251-191/+141
| * | Verify logsGreg Hysen2018-08-251-72/+44
| * | First balance test with intentional valuesGreg Hysen2018-08-252-59/+95
| * | Ironing out the new set of test cases for order matchubngGreg Hysen2018-08-252-11/+102
| * | Rounding for fees in match orders addressed, plus exampleGreg Hysen2018-08-252-9/+83
| * | All existing tests pass.Greg Hysen2018-08-252-21/+137
| * | Added fees to matchOrders (previously in calculateFillResultsGreg Hysen2018-08-251-0/+24
| * | Removed calculateFillResults from matchOrders workflow. Eliminates compounded...Greg Hysen2018-08-251-38/+29
|/ /
* | Merge pull request #1002 from 0xProject/feature/contracts/mutexAmir Bandeali2018-08-2516-176/+680
|\ \
| * | Fix buildAmir Bandeali2018-08-251-4/+7
| * | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow var...Amir Bandeali2018-08-256-61/+11
| * | Add tests for matchOrdersAmir Bandeali2018-08-252-122/+53
| * | Add reentrancy tests for fillOrder and wrapper functionsAmir Bandeali2018-08-254-0/+239
| * | Update ReentrantERC20Token with new functions and check that revert is occuri...Amir Bandeali2018-08-251-35/+75
| * | Add nonReentrant modifiers on functions that use getCurrentContextAddress onl...Amir Bandeali2018-08-254-15/+17
| * | Split modifiers into check only and check, lock, unlockAmir Bandeali2018-08-251-0/+13
| * | Add ReentrantTokenAmir Bandeali2018-08-253-1/+175
| * | Add internal fill functions, add reentrancy guard to public functions that ma...Amir Bandeali2018-08-256-41/+148
| * | Add ReentrancyGuard contractAmir Bandeali2018-08-251-0/+44
| * | Remove redundant sload from getCurrentContextAddressAmir Bandeali2018-08-251-1/+2
|/ /
* | Merge pull request #1003 from 0xProject/feature/contracts/roundupAmir Bandeali2018-08-2518-115/+392
|\ \
| * | Fix linting errorsAmir Bandeali2018-08-251-2/+2
| * | Stylistic fixesRemco Bloemen2018-08-251-5/+20
| * | Append -Floor to getPartialAmount and isRoundingErrorRemco Bloemen2018-08-2517-59/+59
| * | Disambiguate the operator precedenceRemco Bloemen2018-08-251-2/+2
| * | Add testsRemco Bloemen2018-08-254-23/+145
| * | Add docsRemco Bloemen2018-08-251-2/+7
| * | Fix incorect modulusRemco Bloemen2018-08-251-4/+2
| * | Add DIVISION_BY_ZERO to getPartialAmount for consistencyRemco Bloemen2018-08-252-20/+18
| * | Remove .onlyRemco Bloemen2018-08-251-1/+1
| * | Improve getPartialAmountCeil docsRemco Bloemen2018-08-251-3/+3
| * | Add tests for getPartialAmountCeilRemco Bloemen2018-08-252-0/+57
| * | Add isRoundingErrorCeilRemco Bloemen2018-08-251-0/+29
| * | Add getPartialAmountCeilRemco Bloemen2018-08-251-3/+32
| * | Handle zero caseRemco Bloemen2018-08-251-3/+15
| * | Update testsRemco Bloemen2018-08-253-13/+18
| * | Fix isRoundingErrorRemco Bloemen2018-08-251-10/+17
* | | Merge pull request #1021 from 0xProject/feature/contracts/skipselftransferAmir Bandeali2018-08-251-1/+1
|\ \ \ | |_|/ |/| |
| * | Skip self-transfersRemco Bloemen2018-08-251-1/+1
|/ /
* | Merge pull request #1018 from 0xProject/fix/migrations/order-validator-testnetBrandon Millman2018-08-251-1/+7
|\ \
| * | Add testnet network info to OrderValidator artifactBrandon Millman2018-08-251-1/+7
* | | Merge pull request #1015 from 0xProject/feature/contracts/removeCallerSigTypeAmir Bandeali2018-08-259-187/+67
|\ \ \ | |/ / |/| |
| * | Remove remaining Trezor referencesAmir Bandeali2018-08-253-23/+2
| * | SignatureType.Trezor -> SignatureType.EthSign in Signature Validator testsGreg Hysen2018-08-251-1/+1
| * | Fixed linter in signatureUtilsGreg Hysen2018-08-251-1/+1
| * | Test case for Trezor Model T signatureGreg Hysen2018-08-251-0/+18
| * | Fixed trezor personal message in client+contracts; added a test using message...Greg Hysen2018-08-252-1/+19
| * | Remove Trezor SignatureTypeAmir Bandeali2018-08-258-103/+15
| * | Remove SigntureType.Caller from signingUtilsAmir Bandeali2018-08-251-5/+0
| * | Remove SignatureType.CallerAmir Bandeali2018-08-255-58/+16
|/ /
* | Merge pull request #1012 from 0xProject/feature/contracts/staticcallAmir Bandeali2018-08-2513-6/+370
|\ \ | |/ |/|
| * Rethrow Wallet and Validator errorsAmir Bandeali2018-08-255-22/+53
| * Rename TestStaticCall => TestStaticCallReceiverAmir Bandeali2018-08-256-15/+16
| * Revert if undefined function called in AssetProxiesAmir Bandeali2018-08-253-1/+29
| * Remove pragma experimental v0.5.0 and use staticcall is assemblyAmir Bandeali2018-08-256-15/+198
| * Add pragma experimental v0.5.0 to SignatureValidator and add testsAmir Bandeali2018-08-257-2/+123
|/
* Merge pull request #1011 from 0xProject/sra-api/rename/sra-specFrancesco Agosti2018-08-2533-13/+13
|\
| * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into s...fragosti2018-08-2532-248/+247
| |\ | |/ |/|
* | Publishethereum-types@1.0.5contracts@2.1.41@0xproject/website@0.0.45@0xproject/web3-wrapper@2.0.0@0xproject/utils@1.0.6@0xproject/typescript-typings@1.0.5@0xproject/types@1.0.1-rc.5@0xproject/tslint-config@1.0.6@0xproject/testnet-faucets@1.0.42@0xproject/subproviders@2.0.0@0xproject/sra-report@1.0.6@0xproject/sra-api@1.0.1-rc.5@0xproject/sol-resolver@1.0.6@0xproject/sol-cov@2.1.0@0xproject/sol-compiler@1.1.0@0xproject/react-shared@1.0.7@0xproject/react-docs@1.0.6@0xproject/order-watcher@1.0.1-rc.4@0xproject/order-utils@1.0.1-rc.4@0xproject/monorepo-scripts@1.0.6@0xproject/migrations@1.0.5@0xproject/metacoin@0.0.16@0xproject/json-schemas@1.0.1-rc.5@0xproject/forwarder-helper@1.0.1-rc.1@0xproject/fill-scenarios@1.0.1-rc.4@0xproject/dev-utils@1.0.5@0xproject/contract-wrappers@1.0.1-rc.4@0xproject/connect@2.0.0-rc.1@0xproject/base-contract@2.0.0@0xproject/assert@1.0.6@0xproject/abi-gen@1.0.60x.js@1.0.1-rc.4Fabio Berger2018-08-2532-248/+247
| * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into s...fragosti2018-08-2578-117/+1048
| |\ | |/ |/|
* | Updated CHANGELOGSFabio Berger2018-08-2554-97/+359
* | Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-08-252-0/+8
|\ \
| * \ Merge pull request #1010 from 0xProject/feature/website/connect-2-docsFrancesco Agosti2018-08-252-0/+8
| |\ \
| | * | Add documentation for connect v2fragosti2018-08-242-0/+8
* | | | Updated api.jsonFabio Berger2018-08-251-1/+1
* | | | Small fixes to publish scriptFabio Berger2018-08-251-2/+1
|/ / /
* | | Added missing entry for RC packageFabio Berger2018-08-251-0/+8
* | | Excessive commandFabio Berger2018-08-251-1/+0
* | | Merge pull request #1014 from 0xProject/feature/json-schemas/remove-superfluo...Fabio Berger2018-08-241-1/+0
|\ \ \
| * | | Remove superflous id from relayer api fee recipients json schemafragosti2018-08-241-1/+0
|/ / /
* | | Merge pull request #997 from 0xProject/feature/forwarder-helper/initBrandon Millman2018-08-2421-18/+674
|\ \ \ | |/ / |/| |
| * | Upgrade changelog version to get around test-publis CI jobBrandon Millman2018-08-241-1/+1
| * | Remove CHANGELOG.mdBrandon Millman2018-08-241-1/+0
| * | Move sorting phase into its own utils fileBrandon Millman2018-08-242-64/+95
| * | Remove legacy docs stuffBrandon Millman2018-08-244-33/+61
| * | Merge branch 'development' into feature/forwarder-helper/initBrandon Millman2018-08-24282-12489/+3540
| |\ \
| * | | Update _sortedConfigs namingBrandon Millman2018-08-241-4/+4
| * | | Update yarn lockBrandon Millman2018-08-241-0/+4
| * | | Merge branch 'development' into feature/forwarder-helper/initBrandon Millman2018-08-2460-826/+1160
| |\ \ \
| * | | | Fix prettierBrandon Millman2018-08-231-0/+1
| * | | | Fix lint errorsBrandon Millman2018-08-232-3/+3
| * | | | PrettierBrandon Millman2018-08-230-0/+0
| * | | | Add changelog entry and fix order-util changelog PR numbersBrandon Millman2018-08-232-4/+14
| * | | | Add assertions to factoryBrandon Millman2018-08-233-38/+36
| * | | | Add more commentsBrandon Millman2018-08-232-0/+9
| * | | | Write initial forwarderHelperFactoryBrandon Millman2018-08-232-0/+17
| * | | | Add tests for getMarketBuyOrdersInfoBrandon Millman2018-08-233-11/+52
| * | | | Fix rounding bug in marketUtilsBrandon Millman2018-08-232-3/+10
| * | | | Add test for sorting that happens in constructorBrandon Millman2018-08-231-2/+85
| * | | | Update yarn lockBrandon Millman2018-08-231-1/+16
| * | | | Add more TODO itemsBrandon Millman2018-08-231-0/+2
| * | | | Make config public readonlyBrandon Millman2018-08-231-3/+3
| * | | | Add ForwarderHelperImplConfigBrandon Millman2018-08-236-38/+104
| * | | | Remove marketSell and add to marketBuy implementationBrandon Millman2018-08-236-65/+51
| * | | | Add stubs for ForwarderHelper interface in ForwarderHelperImplBrandon Millman2018-08-233-12/+58
| * | | | Flesh out typesBrandon Millman2018-08-233-3/+85
| * | | | Initial skeleton of forwarder-helper packageBrandon Millman2018-08-2315-0/+227
| | | | * Ignore api.json in publicfragosti2018-08-252-1/+1
| | | | * Run prettierfragosti2018-08-251-1/+1
| | | | * Add sra-spec to prettier ignorefragosti2018-08-241-1/+1
| | | | * Point to new s3 bucketfragosti2018-08-241-1/+1
| | | | * Rename sra-api to sra-specfragosti2018-08-2431-10/+10
| |_|_|/ |/| | |
* | | | Merge pull request #1006 from 0xProject/fix/0x.js/uglify-pluginBrandon Millman2018-08-243-4/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update uglify plugin to support es6Brandon Millman2018-08-243-4/+25
|/ / /
* | | Merge pull request #924 from 0xProject/wrap-typedocFabio Berger2018-08-24282-12523/+3570
|\ \ \ | |_|/ |/| |
| * | Remove trailing slashFabio Berger2018-08-241-1/+1
| * | Fix linterFabio Berger2018-08-241-1/+1
| * | Stop nesting interfaces and add necessary type exportsFabio Berger2018-08-242-20/+31
| * | Remove duplicate type and remove nested interfaceFabio Berger2018-08-241-25/+5
| * | Add support for rending the Tuple typeFabio Berger2018-08-233-0/+36
| * | Add missing keyuFabio Berger2018-08-231-1/+5
| * | Remove excessive timestampFabio Berger2018-08-231-1/+0
| * | Improve doc commebntFabio Berger2018-08-231-1/+2
| * | Remove docs catch-all endpointFabio Berger2018-08-231-1/+0
| * | Fix commentsFabio Berger2018-08-232-9/+3
| * | Look for all TS mapped typesFabio Berger2018-08-231-2/+2
| * | Add catch and exit with non-zeroFabio Berger2018-08-231-2/+4
| * | Remove superfluous depFabio Berger2018-08-231-1/+0
| * | Fix CHANGELOG entryFabio Berger2018-08-231-7/+1
| * | Fix double assignmentFabio Berger2018-08-231-1/+1
| * | Upgrade Typedoc to 0.12.0, which works with TS 3.xFabio Berger2018-08-2311-56/+56
| * | Fix prettier issuesFabio Berger2018-08-232-3/+7
| * | Enable dry run of release publishing and handle git tags existingFabio Berger2018-08-233-16/+49
| * | update yarn.lockFabio Berger2018-08-231-3/+7
| * | Missing/superfluous type exports from connectFabio Berger2018-08-231-2/+6
| * | Break with -1 so that the exit code of the loop if hit is non-zeroFabio Berger2018-08-231-1/+1
| * | Prettier fixFabio Berger2018-08-231-1/+1
| * | merge developmentFabio Berger2018-08-2358-812/+1002
| |\ \
| * | | Replace complicated camelCase to spaces logic with change-case packageFabio Berger2018-08-233-22/+140
| * | | Add/improve commentsFabio Berger2018-08-233-5/+11
| * | | Fix changelogsFabio Berger2018-08-232-3/+4
| * | | Merge branch 'development' into wrap-typedocFabio Berger2018-08-231-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | Refactor publish script so that root package.json configs.packagesWithDocs is...Fabio Berger2018-08-2313-57/+41
| * | | Fix many linter errors that showed up upon upgrading tsutilFabio Berger2018-08-2324-94/+83
| * | | Remove monorepo-scripts from tslintconfig.jsonFabio Berger2018-08-221-1/+1
| * | | Use actual packageName for external example importsFabio Berger2018-08-2215-2/+17
| * | | Update all CHANGELOGsFabio Berger2018-08-228-2/+83
| * | | Fix prettierFabio Berger2018-08-222-6/+7
| * | | Update contract-wrappers CHANGELOGFabio Berger2018-08-221-2/+6
| * | | Ignore error of first yarn installFabio Berger2018-08-221-1/+1
| * | | Double install catching first ones errorFabio Berger2018-08-221-1/+3
| * | | Add yarn cache cleanFabio Berger2018-08-221-0/+1
| * | | Remove duplicate install cmdFabio Berger2018-08-221-3/+0
| * | | Run yarn twice on CIFabio Berger2018-08-221-2/+3
| * | | Check yarn info on CircleCiFabio Berger2018-08-221-0/+2
| * | | Improve READMEFabio Berger2018-08-221-1/+1
| * | | Fix remaining merge issuesFabio Berger2018-08-227-43/+39
| * | | Merge development branchFabio Berger2018-08-22125-60381/+7836
| |\ \ \
| * | | | Fix bugs in doc gen due to clone vs cloneDeep and pre-maturely removing place...Fabio Berger2018-08-221-7/+7
| * | | | Fix index.ts given fix in doc generationFabio Berger2018-08-224-31/+11
| * | | | Move types from sol-compiler to types so they can be used in other places wit...Fabio Berger2018-08-2230-111/+190
| * | | | Add generated_docs dir to clean commandFabio Berger2018-08-2211-11/+11
| * | | | Stop logging to console for each packages without a package.jsonFabio Berger2018-08-221-1/+1
| * | | | Use bash for loop for generating docs for each package, revert changes to scriptFabio Berger2018-08-227-67/+67
| * | | | Modify script so it can generate docs for a specific package or all packages...Fabio Berger2018-08-224-40/+65
| * | | | Add shouldUpload flag to docGenAndUpload commandFabio Berger2018-08-222-2/+16
| * | | | Fix lowercase names involving ERC acronymFabio Berger2018-08-221-1/+7
| * | | | Add doc comments to AbiDecoderFabio Berger2018-08-221-1/+18
| * | | | Fix sol-cov index.tsFabio Berger2018-08-221-11/+10
| * | | | Fix sol-compiler index.tsFabio Berger2018-08-221-9/+1
| * | | | Fix order-watcher index.tsFabio Berger2018-08-221-3/+9
| * | | | Fix typeFabio Berger2018-08-221-0/+1
| * | | | Don't check if types are used for libraries only include typesFabio Berger2018-08-222-1/+10
| * | | | Fix up order-utilsFabio Berger2018-08-213-5/+30
| * | | | Rather then look for typeArguments, we want to ignore Partial & Promise refe...Fabio Berger2018-08-211-1/+2
| * | | | Add link to Array typeFabio Berger2018-08-211-0/+1
| * | | | Add missing exports to 0x.js and contract-wrappers index.tsFabio Berger2018-08-212-0/+4
| * | | | Add missing keyFabio Berger2018-08-211-1/+1
| * | | | Move sol-compiler dep to `dependencies` now that types from it are exported i...Fabio Berger2018-08-211-1/+1
| * | | | Implement ignoring config typesFabio Berger2018-08-212-2/+7
| * | | | Add more types and ignores to docGenConfigsFabio Berger2018-08-211-3/+10
| * | | | Fix website given that it still depends on an old version of @0xproject/TypesFabio Berger2018-08-201-2/+5
| * | | | Cleanup web3-wrapper and subproviders index.tsFabio Berger2018-08-202-6/+26
| * | | | Cleanup connect index.tsFabio Berger2018-08-201-1/+1
| * | | | Cleanup contract-wrappers index.tsFabio Berger2018-08-207-40/+41
| * | | | Make sure we don't render protected propertiesFabio Berger2018-08-181-5/+9
| * | | | Make sure export isn't internal to the packageFabio Berger2018-08-181-1/+1
| * | | | Also ignore implementationOfFabio Berger2018-08-181-1/+1
| * | | | Refactor DocGenerateAndUploadUtils to be a class, and decompose large methods...Fabio Berger2018-08-183-348/+427
| * | | | Fix commentFabio Berger2018-08-171-1/+2
| * | | | Move doc configs to a separate fileFabio Berger2018-08-173-47/+59
| * | | | Remove outdating commentFabio Berger2018-08-176-12/+6
| * | | | Undo prettierFabio Berger2018-08-171-237/+237
| * | | | Update yarn.lockFabio Berger2018-08-171-3/+2
| * | | | Merge developmentFabio Berger2018-08-1751-242/+665
| |\ \ \ \
| * | | | | Fix external exports section nameFabio Berger2018-08-171-1/+1
| * | | | | Render external dep exportsFabio Berger2018-08-175-6/+50
| * | | | | Remove stray console logFabio Berger2018-08-171-1/+0
| * | | | | Add links for external dep exports to docJsonFabio Berger2018-08-171-4/+41
| * | | | | Remove unused ContractWrapper exportFabio Berger2018-08-171-2/+0
| * | | | | Export Web3ProviderEngine directly instead of indirectly via subprovidersFabio Berger2018-08-163-39/+44
| * | | | | Check for superfluous types in a packages index.ts and throw if they existFabio Berger2018-08-161-0/+31
| * | | | | Improve Error external linkFabio Berger2018-08-161-1/+1
| * | | | | Remove unused types from 0x.js index.ts discoveredFabio Berger2018-08-161-26/+0
| * | | | | Add externalTypeToLink to docJsonFabio Berger2018-08-161-0/+1
| * | | | | Move external types to link mapping to doc generation util and refactor typed...Fabio Berger2018-08-1617-322/+138
| * | | | | Add version to our custom DocJson formatFabio Berger2018-08-151-1/+3
| * | | | | Move purging private underscored items to the doc json generation phaseFabio Berger2018-08-154-30/+27
| * | | | | Link class reference types exported in same package to their declarationFabio Berger2018-08-1510-44/+163
| * | | | | Remove duplicate Typescript importFabio Berger2018-08-151-2/+1
| * | | | | Add ability to hide specific class constructorsFabio Berger2018-08-151-0/+21
| * | | | | Improve missing type detectionFabio Berger2018-08-151-4/+8
| * | | | | Flesh out 0x.js index.ts and added some exports to other index.ts in the processFabio Berger2018-08-154-6/+51
| * | | | | Merge in new 0x.js interfaceFabio Berger2018-08-1519-10889/+284
| |\ \ \ \ \
| | * | | | | Remove 0x.js from Circle CIFabio Berger2018-08-141-245/+237
| | * | | | | Add PR nr.Fabio Berger2018-08-141-1/+2
| | * | | | | Fix mergeFabio Berger2018-08-1488-415/+667
| | |\ \ \ \ \