ryanml 1739ed9710 conflict fixes

2021-06-10 14:42:59 -07:00

..

account-import-strategies

Use strict assertion mode everywhere (#11012)

2021-06-07 10:02:39 -02:30

constants

@metamask/eslint config@5.0.0 (#10358)

2021-02-04 10:15:23 -08:00

controllers

Using values from shared/constants/time to represent timing values (#11241)

2021-06-10 12:27:03 -07:00

lib

conflict fixes

2021-06-10 14:42:59 -07:00

migrations

Removing support survey notification from What's New (#11118)

2021-06-07 10:33:25 -02:30

platforms

use etherscan-link customBlockExplorer methods with customNetwork usage tracking (#11017)

2021-05-19 09:51:47 -05:00

background.js

Using values from shared/constants/time to represent timing values (#11241)

2021-06-10 12:27:03 -07:00

contentscript.js

@metamask/post-message-stream@4.0.0 (#10989)

2021-06-07 10:00:17 -02:30

disable-console.js

@metamask/eslint config@5.0.0 (#10358)

2021-02-04 10:15:23 -08:00

first-time-state.js

@metamask/eslint config@5.0.0 (#10358)

2021-02-04 10:15:23 -08:00

initSentry.js

@metamask/eslint config@5.0.0 (#10358)

2021-02-04 10:15:23 -08:00

inpage.js

@metamask/providers@8.1.1 (#11078)

2021-06-07 10:07:43 -02:30

metamask-controller.js

Using values from shared/constants/time to represent timing values (#11241)

2021-06-10 12:27:03 -07:00

metamask-controller.test.js

Use strict assertion mode everywhere (#11012)

2021-06-07 10:02:39 -02:30

phishing-detect.js

Version v9.5.0 RC (#10944)

2021-05-05 11:08:59 -07:00

runLockdown.js

Version v9.5.0 RC (#10944)

2021-05-05 11:08:59 -07:00

ui.js

Version v9.5.0 RC (#10944)

2021-05-05 11:08:59 -07:00