diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /browser/components/newtab/NewTabRemoteResources.jsm | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'browser/components/newtab/NewTabRemoteResources.jsm')
| -rw-r--r-- | browser/components/newtab/NewTabRemoteResources.jsm | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/browser/components/newtab/NewTabRemoteResources.jsm b/browser/components/newtab/NewTabRemoteResources.jsm deleted file mode 100644 index 57351b15c..000000000 --- a/browser/components/newtab/NewTabRemoteResources.jsm +++ /dev/null @@ -1,15 +0,0 @@ -/* exported NewTabRemoteResources */ - -"use strict"; - -this.EXPORTED_SYMBOLS = ["NewTabRemoteResources"]; - -const NewTabRemoteResources = { - MODE_CHANNEL_MAP: { - production: {origin: "https://content.cdn.mozilla.net"}, - staging: {origin: "https://s3_proxy_tiles.stage.mozaws.net"}, - test: {origin: "https://example.com"}, - test2: {origin: "http://mochi.test:8888"}, - dev: {origin: "http://localhost:8888"} - } -}; |