Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 23:23:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland. a=merge CLOSED TREE

Browse Source
This commit is contained in:
Ciure Andrei 2018-04-26 12:19:43 +03:00
commit 55be309816
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/components/preferences/in-content/extensionControlled.js
View File

@ -60,13 +60,12 @@ let extensionControlledContentIds = {
function getExtensionControlledArgs(settingName) {
switch (settingName) {
case "proxyConfig":
return [document.getElementById("bundleBrand").getString("brandShortName$
return [document.getElementById("bundleBrand").getString("brandShortName")];
default:
return [];
}
}
let extensionControlledIds = {};
/**