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 /browser/app/permissions | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'browser/app/permissions')
| -rw-r--r-- | browser/app/permissions | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/browser/app/permissions b/browser/app/permissions deleted file mode 100644 index a2afdded2..000000000 --- a/browser/app/permissions +++ /dev/null @@ -1,23 +0,0 @@ -# This file has default permissions for the permission manager.
-# The file-format is strict:
-# * matchtype \t type \t permission \t host
-# * "origin" should be used for matchtype, "host" is supported for legacy reasons
-# * type is a string that identifies the type of permission (e.g. "cookie")
-# * permission is an integer between 1 and 15
-# See nsPermissionManager.cpp for more...
-
-# UITour
-origin uitour 1 https://www.mozilla.org
-origin uitour 1 https://self-repair.mozilla.org
-origin uitour 1 https://support.mozilla.org
-origin uitour 1 https://addons.mozilla.org
-origin uitour 1 https://discovery.addons.mozilla.org
-origin uitour 1 about:home
-
-# XPInstall
-origin install 1 https://addons.mozilla.org
-origin install 1 https://testpilot.firefox.com
-
-# Remote troubleshooting
-origin remote-troubleshooting 1 https://input.mozilla.org
-origin remote-troubleshooting 1 https://support.mozilla.org
|