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/components/preferences/in-content/jar.mn | |
| 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/components/preferences/in-content/jar.mn')
| -rw-r--r-- | browser/components/preferences/in-content/jar.mn | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/browser/components/preferences/in-content/jar.mn b/browser/components/preferences/in-content/jar.mn deleted file mode 100644 index 130bf8549..000000000 --- a/browser/components/preferences/in-content/jar.mn +++ /dev/null @@ -1,18 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -browser.jar: - content/browser/preferences/in-content/preferences.js -* content/browser/preferences/in-content/preferences.xul - content/browser/preferences/in-content/subdialogs.js - - content/browser/preferences/in-content/main.js - content/browser/preferences/in-content/privacy.js - content/browser/preferences/in-content/containers.js - content/browser/preferences/in-content/advanced.js - content/browser/preferences/in-content/applications.js -* content/browser/preferences/in-content/content.js - content/browser/preferences/in-content/sync.js -* content/browser/preferences/in-content/security.js - content/browser/preferences/in-content/search.js |