aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* version bumpChen Wei2019-09-221-1/+1
* add mainnetChen Wei2019-09-225-2/+30
* bump version to 6.8.2Chen Wei2019-09-161-1/+1
* bump versionChen Wei2019-09-061-1/+1
* do not base64 encode "inpage.js"Chen Wei2019-09-061-7/+10
* update some logosChen Wei2019-09-0611-18/+54
* bump versionChen Wei2019-07-181-1/+1
* this will work on FFChen Wei2019-07-181-1/+1
* do not load inpage.js by "fs". They can be accessed with extension URLChen Wei2019-07-182-37/+9
* 1. rename stream target name 2. do not expose web3Chen Wei2019-07-183-24/+24
* bump versionChen Wei2019-07-081-1/+1
* update html titleChen Wei2019-07-056-6/+6
* make it work on FFChen Wei2019-07-041-2/+3
* update manifestChen Wei2019-07-041-3/+3
* version bumpChen Wei2019-07-041-1/+1
* update wordingChen Wei2019-07-041-1/+1
* update extension notificationChen Wei2019-07-041-3/+5
* revert replacing "ETH" with "TAN"Chen Wei2019-07-022-8/+4
* configuration, translation updatingChen Wei2019-07-0211-260/+140
* translation needed by extension setupChen Wei2019-07-022-4/+4
* part of the style refinementChen Wei2019-07-0213-91/+122
* dapp handler injected as "tangerine"Chen Wei2019-07-023-4/+6
* 1. correct name display in network dropdown 2. enable 373 derived pathChen Wei2019-07-0125-5/+76
* be able to switch between eth and tanChen Wei2019-06-282-4/+39
* Version 6.7.1v6.7.1Mark Stacey2019-06-281-1/+1
* Version 6.7.0v6.7.0Thomas2019-06-261-1/+1
* Merge branch 'develop' into Version-6.6.2Thomas Huang2019-06-186-127/+54
|\
| * Add delete to custom RPC form (#6718, #6650)Dan J Miller2019-06-172-0/+6
| * Wrap smaller custom block explorer url text (#6714)Thomas Huang2019-06-171-0/+3
| * MetaMorph - Spacing and Typeface on Extension Main view (#6584)Chi Kei Chan2019-06-134-127/+45
* | Version 6.6.2 RC1v6.6.2Dan Finlay2019-06-081-1/+1
|/
* Version 6.6.1 RC1v6.6.1Dan Finlay2019-06-071-1/+1
* Version 6.6.0 RC1Dan Finlay2019-06-041-1/+1
* Revert "Remove clipboardWrite permission"Dan Finlay2019-06-041-0/+1
* feature: integrate gaba/CurrencyRateController (#6570)Paul Bouchon2019-06-013-226/+13
* Merge pull request #6654 from whymarrh/manifest-permissionsDan Finlay2019-06-011-1/+0
|\
| * Remove clipboardWrite permissionWhymarrh Whitby2019-05-241-1/+0
* | bugfix: reject enable promise on user rejectionbitpshr2019-06-011-2/+2
* | mergepldespaigne2019-05-3137-990/+909
|\|
| * transactions/deps - use broken out nonce-tracker module (#6555)Frankie2019-05-212-162/+1
| * Fix grammatical error in i18n endOfFlowMessage6 (#6633)Chi Kei Chan2019-05-211-1/+1
| * Update translation (#6628)matteopey2019-05-211-4/+230
| * Version 6.5.3 RC1v6.5.3Dan Finlay2019-05-161-1/+1
| * bugfix: show extension window if locked regardless of approvalbitpshr2019-05-161-1/+2
| * drop transactions who's nonce is lower then the known network nonce but were ...Frankie2019-05-162-8/+46
| * Adds e2e test for removing imported accounts. (#6615)Dan J Miller2019-05-161-1/+1
| * Version BumpThomas Huang2019-05-151-1/+1
| * Fixes bugs in 6.5.1 (#6613)Bruno Barbieri2019-05-151-1/+1
| * Merge pull request #6605 from MetaMask/Version-6.5.1v6.5.1Dan Finlay2019-05-151-1/+1
| |\
| | * Version 6.5.1 RC1Dan Finlay2019-05-151-1/+1
| * | feature: integrate gaba/ShapeShiftController (#6569)Paul Bouchon2019-05-152-187/+5
| |/
| * Set a default value for code in _determineTransactionCategory (#6604)Dan J Miller2019-05-152-13/+13
| * Merge pull request #6596 from MetaMask/Version-6.5.0Thomas Huang2019-05-141-1/+1
| |\
| | * Version 6.5.0 RC1Dan Finlay2019-05-111-1/+1
| * | Update auto-logout to recognize idle time in background (#6593)Whymarrh Whitby2019-05-143-1/+86
| |/
| * Merge pull request #6568 from MetaMask/feature/gaba-phishing-controllerThomas Huang2019-05-112-143/+8
| |\
| | * feature: integrate gaba/PhishingControllerbitpshr2019-05-092-143/+8
| * | New settings custom rpc form (#6490)Dan J Miller2019-05-104-25/+60
| |/
| * Check for unused function arguments (#6583)Whymarrh Whitby2019-05-099-16/+15
| * Adds a transactionCategory to txMeta for use in UI (#6567)Dan J Miller2019-05-092-7/+59
| * Auto logout after specific time (#6558)Chi Kei Chan2019-05-091-0/+6
| * Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410)kumavis2019-05-0412-387/+278
| * Include token checksum address in prices lookup for token rates (#6526)Thomas Huang2019-05-011-1/+3
| * Send metrics event from backend for on chain transaction failures (#6500)Dan J Miller2019-04-293-1/+52
| * Version 6.4.1 RC1v6.4.1Dan Finlay2019-04-271-1/+1
| * Opens the original webpage from where installation of MetaMask was re… (#6272)Sneh Koul2019-04-252-0/+7
| * Version 6.4.0 RC1Dan Finlay2019-04-181-1/+1
| * Add token selection to the send screen (#6445)Chi Kei Chan2019-04-181-0/+6
| * feature: add Goerli support (#6459)Paul Bouchon2019-04-187-2/+29
| * Merge pull request #6444 from MetaMask/localhost-network-dropdownThomas Huang2019-04-172-2/+5
| |\
| | * Set rpcTarget, nickname, and ticker when selecting one of the default networksThomas Huang2019-04-171-2/+2
| | * Add Localhost 8545 for network dropdown namesThomas Huang2019-04-111-0/+3
| * | feature: switch token pricing to CoinGecko API (#6424)Paul Bouchon2019-04-111-8/+8
| |/
| * Don't inject web3 on sharefile.comWhymarrh Whitby2019-04-101-0/+1
| * Version 6.3.2 (#6418)Dan J Miller2019-04-091-1/+1
| * Merge pull request #6401 from MetaMask/provider-error-fixkumavis2019-04-052-18/+2
| |\
| | * metamask-controller - use improved provider-as-middleware utilitykumavis2019-04-042-18/+2
| * | Merge pull request #6406 from MetaMask/remove-user-actions-controllerJenny Pollack2019-04-051-17/+0
| |\ \ | | |/ | |/|
| | * remove user actions controllerJenny Pollack2019-03-261-17/+0
* | | refactor & change html pagespldespaigne2019-05-055-154/+11
* | | add rinkeby & goerlipldespaigne2019-05-051-0/+6
* | | issue#5742pldespaigne2019-04-043-26/+42
* | | renaming registrar into registrypldespaigne2019-04-042-8/+8
|/ /
* | Remove NoticeController (#6382)Thomas Huang2019-04-025-129/+34
* | Merge pull request #6375 from MetaMask/Version-6.3.1v6.3.1Thomas Huang2019-03-301-1/+1
|\ \
| * | Version 6.3.1Dan Miller2019-03-301-1/+1
* | | About tab copy changes; Update route for Info & Help in account menu (#6356)Chi Kei Chan2019-03-301-0/+6
|/ /
* | Merge pull request #6364 from MetaMask/prevent-infura-requests-e2e-testsWhymarrh Whitby2019-03-291-2/+10
|\ \
| * | Default to localhost network when running e2e testsDan Miller2019-03-291-2/+10
* | | Merge pull request #6328 from MetaMask/clearNoticeskumavis2019-03-293-3/+25
|\ \ \
| * | | notice-controller - make markAllNoticesRead synckumavis2019-03-291-1/+1
| * | | lib - nodeify - correctly wrap synchronous functionskumavis2019-03-291-3/+12
| * | | notices - markAllNoticesRead - use async/awaitkumavis2019-03-292-15/+10
| * | | Merge branch 'develop' into clearNoticeskumavis2019-03-299-7/+83
| |\| |
| * | | Clear notices when setCompletedOnboarding is calledThomas Huang2019-03-212-0/+18
* | | | buy-eth-url - lint fixkumavis2019-03-291-1/+1
* | | | buy-eth-url - fix variable namekumavis2019-03-291-2/+2
* | | | Merge branch 'develop' of https://github.com/vimalsagar/metamask-extension in...kumavis2019-03-2923-15/+217
|\ \ \ \ | |_|/ / |/| | |
| * | | getBuyEthUrl - getDefaultServiceForNetwork then switch on servicekumavis2019-03-291-23/+29
| * | | PR 5575 review comment fixesVimal2019-02-281-23/+24
| * | | merging upstream branchVimal2018-11-1257-1865/+5523
| |\ \ \
| * | | | Adding CoinSwitch exchangeVimal2018-10-2223-0/+193
* | | | | Version 6.3.0 (#6350)v6.3.0Dan J Miller2019-03-271-1/+1
* | | | | enable privacy mode for first time users (#6347)Thomas Huang2019-03-261-1/+3
| |_|_|/ |/| | |
* | | | Cancel error rebased (#6341)Dan J Miller2019-03-261-0/+3
* | | | New settings page rebased (#6333)Dan J Miller2019-03-262-3/+45
* | | | Replaces the coinbase link in the deposit modal with one for wyre (#6302)Dan J Miller2019-03-223-1/+19
* | | | Hide gas price chart and prevent api call when not on ethereum networks. (#6300)Dan J Miller2019-03-221-0/+3
* | | | Folder restructure (#6304)Chi Kei Chan2019-03-221-1/+1
* | | | Stop reloading dapps on network change allowing dapps to decide if it should ...Josh Stevens2019-03-222-0/+8
| |_|/ |/| |
* | | Fix typos in English messages (#6317)Thomas Huang2019-03-191-2/+2
* | | Fixes popups not showing when screen size is odd (#6312)William Monti Souza2019-03-181-2/+2
* | | Centre the notification in the current window (#6307)Whymarrh Whitby2019-03-151-4/+3
* | | Patch/bump version (#6294)v6.2.2Thomas Huang2019-03-131-1/+1
* | | Merge pull request #6271 from whymarrh/centre-notificatonskumavis2019-03-121-5/+10
|\ \ \
| * | | Centre all notification popupsWhymarrh Whitby2019-03-121-5/+10
* | | | Improve Korean translations (#6268)bowbowbow2019-03-121-29/+350
|/ / /
* | | mascara - remove from project (#6283)kumavis2019-03-121-1/+0
* | | GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-123-109/+8
* | | Merge pull request #6279 from MetaMask/notification-windowThomas Huang2019-03-121-1/+1
|\ \ \
| * | | Nonmultiple notifications for batch txsThomas Huang2019-03-121-1/+1
* | | | Version 6.2.1 (#6251)Thomas Huang2019-03-121-1/+1
* | | | Uppercase and context fixes on Spanish translation.Pedro Gutiérrez2019-03-071-18/+18
|/ / /
* | | Version 6.2.0 (#6239)v6.2.0Dan J Miller2019-03-061-1/+1
* | | Fix typoThomas Huang2019-03-061-1/+1
* | | Metametrics (#6171)Dan J Miller2019-03-054-4/+113
* | | SimplifyThomas Huang2019-03-051-1/+1
* | | ImprovementThomas Huang2019-03-011-1/+1
* | | Show popup if notification or activeMMtab is true but not if popup is openThomas Huang2019-03-011-1/+1
* | | First time flow updates (#6192)Dan J Miller2019-02-274-1/+74
* | | Show/Hide Fiat on Testnets based on User Preference (#6153)Chi Kei Chan2019-02-271-0/+6
* | | Feature Flag + Mobile Sync (#5955)Dan Finlay2019-02-263-1/+97
* | | account tracker - update accounts from balanceChecker contract (#6181)Jenny Pollack2019-02-213-3/+70
* | | EIP-1193: standard provider API (#6170)Paul Bouchon2019-02-209-23/+138
* | | Merge pull request #6183 from chikeichan/5171Dan J Miller2019-02-201-1/+1
|\ \ \
| * | | Bring Popup to front when ui is tiggeredChi Kei Chan2019-02-191-1/+1
* | | | Version 6.1.0 RC1Dan Finlay2019-02-201-1/+1
* | | | Change "Token Address" to "Token Contract Address" (#6182)Chi Kei Chan2019-02-201-0/+3
|/ / /
* | | Fix inpage.js event handler memory leak (#6177)Graham Kaemmer2019-02-191-4/+5
* | | Add Copy Tx ID button to transaction-list-item-details (#6146)Chi Kei Chan2019-02-171-0/+6
* | | Merge pull request #6137 from whymarrh/es6-backgroundWhymarrh Whitby2019-02-148-32/+32
|\ \ \
| * | | Update popup-core script to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-6/+6
| * | | Update platforms/extension to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| * | | Update phishing-detect script to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| * | | Update NoticesController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-3/+3
| * | | Update MetaMaskController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| * | | Fix all "var used instead of let or const" problems in inpage.jsWhymarrh Whitby2019-02-121-4/+4
| * | | Update contentscript to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| * | | Fix all "var used instead of let or const" problems in background.jsWhymarrh Whitby2019-02-121-7/+7
* | | | Fixed issue #5838 (#6001)Jonathan Smirnoff2019-02-142-0/+6
* | | | Merge pull request #6124 from MetaMask/dissable-recent-block-controllerThomas Huang2019-02-133-4/+30
|\ \ \ \
| * | | | fix typofrankiebee2019-02-131-4/+4
| * | | | recent-blocks - dont listen for block when on infura providersfrankiebee2019-02-123-4/+30
* | | | | Version 6.0.1 (#6141)v6.0.1Whymarrh Whitby2019-02-131-1/+1
| |/ / / |/| | |
* | | | Update Italian translation (#6119)matteopey2019-02-121-40/+277
* | | | Improved Traditional Chinese translation (#6125)S.C. Chen2019-02-121-102/+735
* | | | Version 6 RC1 (#6117)Dan Finlay2019-02-121-1/+1
|/ / /
* | | Fix locale codes contains underscore will never be preferred (#6116)S.C. Chen2019-02-091-4/+11
* | | Add Swap feature to CurrencyInput (#6091)Chi Kei Chan2019-02-061-0/+1
* | | Add togglable advanced gas controls on send and confirm screens (#6112)Dan J Miller2019-02-061-0/+12
* | | Update design of phishing warning screenWhymarrh Whitby2019-02-063-77/+465
* | | Add announcement for users migrated to the new UIWhymarrh Whitby2019-02-053-1/+5
* | | Remove betaUI preference state, replace with completedUiMigrationWhymarrh Whitby2019-02-052-4/+39
* | | Default to the new UI for all usersWhymarrh Whitby2019-02-051-20/+2
* | | Version 5.3.5 (#6109)v5.3.5Whymarrh Whitby2019-02-051-1/+1
* | | Privacy mode fixes (#6087)Bruno Barbieri2019-02-021-13/+15
* | | Version 5.3.4 RC1 (#6084)Dan Finlay2019-02-011-1/+1
* | | fix - migration 30 undefinds (#6079)Frankie2019-02-011-16/+18
* | | Version 5.3.3 RC1v5.3.3Dan Finlay2019-01-311-1/+1
* | | EIP-1102 updates (#6006)Paul Bouchon2019-01-312-24/+28
* | | Improved Spanish translations (#6072)Pedro Gutiérrez2019-01-311-13/+13
* | | Add visual indicator when displaying a cached balance (#5854)Dan J Miller2019-01-301-0/+3
* | | I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-302-2/+51
* | | Version 5.3.2 RC1 (#6069)Dan Finlay2019-01-291-1/+1
* | | add source for header in create infura client (#6023)Jenny Pollack2019-01-251-1/+1
* | | Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-236-2/+106
* | | Updated Spanish translations (#6046)oliver renwick2019-01-231-3/+577
* | | Prevent send to token (#6051)Esteban Miño2019-01-231-0/+3
* | | fix asset detection (#6049)Bruno Barbieri2019-01-231-2/+18
* | | Use Parity on-chain registry only when is needed (#6052)Esteban Miño2019-01-232-0/+15
* | | I#5956 fix 1 (#6026)Frankie2019-01-183-1/+53
* | | Fix grammar error in Current Conversion (#6029)Alexander Tseung2019-01-171-2/+2
* | | Version 5.3.1 RC2Dan Finlay2019-01-171-1/+1
* | | Merge pull request #5966 from filips123/patch-1Thomas Huang2019-01-111-3/+180
|\ \ \
| * \ \ Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...Filip Š2019-01-106-10/+14
| |\ \ \
| * | | | Update Slovenian translationFilip Š2018-12-261-3/+180
* | | | | Set auto conversion off for token/eth conversion (#6005)Thomas Huang2019-01-111-1/+1
| |/ / / |/| | |
* | | | Refine app descriptionDan Finlay2019-01-061-1/+1
* | | | Wrong french translationWathis2019-01-041-6/+6
* | | | Merge pull request #5987 from MetaMask/Version-5.3.0Thomas Huang2019-01-041-1/+1
|\ \ \ \
| * | | | Version 5.3.0 RC1v5.3.0Dan Finlay2019-01-031-1/+1
* | | | | Merge pull request #5992 from MetaMask/i5140-accountsThomas Huang2019-01-041-0/+4
|\ \ \ \ \
| * | | | | Add scrolling button to account listAlexander Tseung2019-01-041-0/+4
| |/ / / /
* / / / / fix typo in phishing.html titlePaul Chonpimai2019-01-031-1/+1
|/ / / /
* | | | fix extension linkbrunobar792019-01-031-1/+1
* | | | Fix etherscan links on notificationsBruno Barbieri2018-12-291-1/+1
|/ / /
* | | Disallow loading as metamaskNetworkId (#5924)Frankie2018-12-141-1/+3
* | | Merge pull request #5893 from MetaMask/loading-network-screenDan J Miller2018-12-141-0/+9
|\ \ \
| * | | Clean up for the loading-network-screenDan Miller2018-12-131-0/+6
| * | | Add identifier of private network to the network loading screen message.Dan Miller2018-12-131-0/+3
* | | | Version 5.2.2 RC1v5.2.2Dan Finlay2018-12-131-1/+1
|/ / /
* | | Merge pull request #5919 from MetaMask/gas-customization-fixesDan J Miller2018-12-131-0/+30
|\ \ \
| * | | Add missing translation to the gas customization component.Dan Miller2018-12-131-0/+30
* | | | Version 5.2.1 RC1 (#5918)v5.2.1Dan J Miller2018-12-131-1/+1
|/ / /
* | | Merge pull request #5902 from MetaMask/i5846-ProviderCrashesThomas Huang2018-12-121-1/+1
|\ \ \
| * | | Changelog and version bump for 5.2.0Dan Miller2018-12-121-1/+1
* | | | Show Failed transaction in the browser notification for on-chain failures (#5...Alexander Tseung2018-12-111-4/+7
|/ / /
* | | Group transactions by nonce (#5886)Alexander Tseung2018-12-1010-16/+65
* | | Merge pull request #5892 from MetaMask/fix-net-version-race-conditionThomas Huang2018-12-081-4/+10
|\ \ \
| * | | Fix race condition in network controller lookup() method.Dan Miller2018-12-071-4/+10
* | | | Fill in more Polish message translationsWhymarrh Whitby2018-12-061-0/+9
|/ / /
* | | Fix "fastest" translation message; change to sentence caseDan Miller2018-12-041-1/+1
* | | Adds createSpeedUpTransaction to txControllerDan Miller2018-12-042-0/+30
* | | Redesign of gas customization basic tab.Dan Miller2018-12-041-0/+3
* | | Clean up for advanced gas tab customization changes.Dan Miller2018-12-041-0/+3
* | | Test updates and additions for button integration with send screen.Dan Miller2018-12-041-0/+3
* | | Integrate gas buttons with the send screen.Dan Miller2018-12-041-0/+12
* | | Split advanced-tab-content.component.js render() method into smaller pieces;...Dan Miller2018-12-041-0/+12
* | | Adds the content of the advanced tab - w/o chart or dynamic content - to gas ...Dan Miller2018-12-041-0/+6
* | | Adds new gas customization modal container (without content)Dan Miller2018-12-041-0/+18
* | | Version 5.1.0: East BayDan Finlay2018-12-041-1/+1
* | | Update phishing warning copyDan Finlay2018-12-041-5/+4
* | | Hide link for phishing-detect page (#5864)Michael - Blurpesec2018-12-021-1/+1
* | | fix visibilityBruno Barbieri2018-12-011-1/+0
* | | Save recent network balances in local storage (#5843)Dan J Miller2018-12-012-0/+92
* | | bugfix: normalize contract addresss when fetching exchange rates (#5863)Paul Bouchon2018-12-011-1/+3
* | | Fixed Vivek's bug (#5860)Dan Finlay2018-11-301-2/+10
* | | Version 5.0.4 RC1 (#5859)v5.0.4Dan Finlay2018-11-301-2/+2
* | | transactions/tx-gas-utils - add the acctual response for eth_getCode for NO_C...Frankie2018-11-301-0/+9
* | | Merge pull request #5848 from MetaMask/Less-Certain-LanguageWhymarrh Whitby2018-11-291-1/+1
|\ \ \
| * | | Soften accusatory language on phishing warningDan Finlay2018-11-291-1/+1
* | | | Open full-screen UI on installWhymarrh Whitby2018-11-271-5/+4
* | | | Revert "Don't open MetaMask website after install"Whymarrh Whitby2018-11-271-0/+9
|/ / /
* | | Autofill gasPrice for retry attempts with either the recommended gasprice or ...Frankie2018-11-271-0/+9
* | | transactions - ensure err is defined when setting tx failed (#5801)Frankie2018-11-271-4/+6
* | | Merge pull request #5792 from MetaMask/signed-type-data-error-hw-walletBruno Barbieri2018-11-271-9/+16
|\ \ \
| * | | Use Array.includesBruno Barbieri2018-11-271-4/+4
| * | | remove extra semicolonbrunobar792018-11-211-1/+1
| * | | consider hw walletsbrunobar792018-11-211-9/+16
* | | | Show Connect Requests count in extension badgeWhymarrh Whitby2018-11-261-1/+3
* | | | Use initState to avoid type-checking providerRequests in stateWhymarrh Whitby2018-11-261-3/+5
* | | | Increase Token Symbol length to twelveThomas Huang2018-11-2320-42/+42
* | | | Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-225-1/+121
|\ \ \ \
| * | | | trezor v6brunobar792018-11-211-2/+2
| * | | | fix merge conflictsbrunobar792018-11-2115-24/+97
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-153-2/+22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-151-0/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into trezor-v5brunobar792018-11-1416-418/+1816
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-11-0749-1798/+3537
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-10-2110-55/+1373
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 03:29:09 +0800