diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-31 07:53:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-31 07:53:04 +0200 |
| commit | bf1454c8ee3d78751852c6098da92c70c715b814 (patch) | |
| tree | 205cc50bce12012d69d3d3564a1edc0de57aaf5e /browser/app | |
| parent | e1084c8b24f9edda1d40b95d0089edf589da482d (diff) | |
| parent | 5f89c3da66862d82fa27092986c4065aba3574ff (diff) | |
| download | UXP-bf1454c8ee3d78751852c6098da92c70c715b814.tar UXP-bf1454c8ee3d78751852c6098da92c70c715b814.tar.gz UXP-bf1454c8ee3d78751852c6098da92c70c715b814.tar.lz UXP-bf1454c8ee3d78751852c6098da92c70c715b814.tar.xz UXP-bf1454c8ee3d78751852c6098da92c70c715b814.zip | |
Merge pull request #416 from Ascrod/Social
Remove the Social API
Diffstat (limited to 'browser/app')
| -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); |