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/browser/discovery_install.html | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.gz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.lz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.xz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.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/browser/discovery_install.html')
| -rw-r--r-- | toolkit/mozapps/webextensions/test/browser/discovery_install.html | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/toolkit/mozapps/webextensions/test/browser/discovery_install.html b/toolkit/mozapps/webextensions/test/browser/discovery_install.html deleted file mode 100644 index c6499ec03..000000000 --- a/toolkit/mozapps/webextensions/test/browser/discovery_install.html +++ /dev/null @@ -1,19 +0,0 @@ -<html> -<head> -<script type="text/javascript"> -/* globals InstallTrigger */ -function install() { - InstallTrigger.install({ - "Test Add-on": { - URL: "https://example.com/browser/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi" - } - }); -} -</script> -</head> -<body> - <h1>Test page for the discovery pane</h1> - <p><a id="install-direct" href="https://example.com/browser/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi">Direct install</a></p> - <p><a id="install-js" href="javascript:install()">JS install</a></p> -</body> -</html> |