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 /toolkit/mozapps/webextensions/test/addons/webextension_1 | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'toolkit/mozapps/webextensions/test/addons/webextension_1')
| -rw-r--r-- | toolkit/mozapps/webextensions/test/addons/webextension_1/chrome.manifest | 1 | ||||
| -rw-r--r-- | toolkit/mozapps/webextensions/test/addons/webextension_1/manifest.json | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/toolkit/mozapps/webextensions/test/addons/webextension_1/chrome.manifest b/toolkit/mozapps/webextensions/test/addons/webextension_1/chrome.manifest deleted file mode 100644 index 16108ce18..000000000 --- a/toolkit/mozapps/webextensions/test/addons/webextension_1/chrome.manifest +++ /dev/null @@ -1 +0,0 @@ -content webex ./ diff --git a/toolkit/mozapps/webextensions/test/addons/webextension_1/manifest.json b/toolkit/mozapps/webextensions/test/addons/webextension_1/manifest.json deleted file mode 100644 index 2ca5f40f7..000000000 --- a/toolkit/mozapps/webextensions/test/addons/webextension_1/manifest.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Web Extension Name", - "version": "1.0", - "manifest_version": 2, - "applications": { - "gecko": { - "id": "webextension1@tests.mozilla.org" - } - }, - "icons": { - "48": "icon48.png", - "64": "icon64.png" - } -} |