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 /testing/profiles | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'testing/profiles')
| -rw-r--r-- | testing/profiles/prefs_general.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index d30ae89f5..515828d29 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -297,10 +297,6 @@ user_pref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test"); user_pref("browser.newtabpage.directory.source", 'data:application/json,{"testing":1}'); user_pref("browser.newtabpage.directory.ping", ""); -// Ensure UITour won't hit the network -user_pref("browser.uitour.pinnedTabUrl", "http://%(server)s/uitour-dummy/pinnedTab"); -user_pref("browser.uitour.url", "http://%(server)s/uitour-dummy/tour"); - // Tell the search service we are running in the US. This also has the desired // side-effect of preventing our geoip lookup. user_pref("browser.search.isUS", true); |