Merge branch 'master' into proxy-support

This commit is contained in:
luke crouch
2021-09-28 17:07:21 -05:00
15 changed files with 483 additions and 197 deletions
+1 -1
View File
@@ -712,7 +712,7 @@ window.assignManager = {
reloadPageInContainer(url, currentUserContextId, userContextId, index, active, neverAsk = false, openerTabId = null) {
const cookieStoreId = backgroundLogic.cookieStoreId(userContextId);
const loadPage = browser.extension.getURL("confirm-page.html");
const loadPage = browser.runtime.getURL("confirm-page.html");
// False represents assignment is not permitted
// If the user has explicitly checked "Never Ask Again" on the warning page we will send them straight there
if (neverAsk) {