diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-03-13 07:49:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 07:49:07 +0100 |
| commit | bf0413359245579e9509146d42cd5547e35da695 (patch) | |
| tree | 8218d4f60d9eccacbf42df8cb88094a082d401b4 /js/src/tests/user.js | |
| parent | 51b821b3fdc5a7eab2369cb6a6680598a6264b08 (diff) | |
| parent | 709bc24e9110eba12f94cfcb8db00a8338ac4098 (diff) | |
| download | UXP-bf0413359245579e9509146d42cd5547e35da695.tar UXP-bf0413359245579e9509146d42cd5547e35da695.tar.gz UXP-bf0413359245579e9509146d42cd5547e35da695.tar.lz UXP-bf0413359245579e9509146d42cd5547e35da695.tar.xz UXP-bf0413359245579e9509146d42cd5547e35da695.zip | |
Merge pull request #998 from MoonchildProductions/master
Merge master into Sync-weave
Diffstat (limited to 'js/src/tests/user.js')
| -rwxr-xr-x | js/src/tests/user.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/src/tests/user.js b/js/src/tests/user.js index 732bbbd1a..e75593ab1 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -22,7 +22,6 @@ user_pref("javascript.options.strict", false); user_pref("javascript.options.werror", false); user_pref("toolkit.startup.max_resumed_crashes", -1); user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true); -user_pref("toolkit.telemetry.enabled", false); user_pref("browser.safebrowsing.phishing.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); user_pref("browser.safebrowsing.forbiddenURIs.enabled", false); |