diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-25 22:00:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 22:00:26 +0200 |
| commit | d5459982f0d1bab08b751dc140c4cbe047032617 (patch) | |
| tree | 0dfe07f8e1b8d121d12de8d16df524db344c6826 /browser/app/profile | |
| parent | edccc615f9435d658febac9be2299542349e2b08 (diff) | |
| parent | f786134c442da55a2a45e1422ef8530c892899b6 (diff) | |
| download | UXP-d5459982f0d1bab08b751dc140c4cbe047032617.tar UXP-d5459982f0d1bab08b751dc140c4cbe047032617.tar.gz UXP-d5459982f0d1bab08b751dc140c4cbe047032617.tar.lz UXP-d5459982f0d1bab08b751dc140c4cbe047032617.tar.xz UXP-d5459982f0d1bab08b751dc140c4cbe047032617.zip | |
Merge pull request #381 from Ascrod/master
Remove the Social API
Diffstat (limited to 'browser/app/profile')
| -rw-r--r-- | browser/app/profile/firefox.js | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index e432c511d..ede62fd5e 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1118,13 +1118,6 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false); // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -pref("social.sidebar.unload_timeout_ms", 10000); - -// Activation from inside of share panel is possible if activationPanelEnabled -// is true. Pref'd off for release while usage testing is done through beta. -pref("social.share.activationPanelEnabled", true); -pref("social.shareDirectory", "https://activations.cdn.mozilla.net/sharePanel.html"); - // Block insecure active content on https pages pref("security.mixed_content.block_active_content", true); |