diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-29 22:58:52 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-29 22:58:52 +0200 |
| commit | e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51 (patch) | |
| tree | f8d4d2b62b2bcd2f5b37ce7cbf6fa873cff185b0 /toolkit/content | |
| parent | bfb36627c66ff8a27da7c1bace60496352fd096b (diff) | |
| parent | e4b2fa17baea1d35d80de19ffb90d9ba2a1033f8 (diff) | |
| download | UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.tar UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.tar.gz UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.tar.lz UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.tar.xz UXP-e09746b2f34ce69c7bc4c86b1f90f62b7c8d9c51.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
# security/manager/ssl/nsSTSPreloadList.errors
# security/manager/ssl/nsSTSPreloadList.inc
Diffstat (limited to 'toolkit/content')
| -rw-r--r-- | toolkit/content/aboutSupport.js | 1 | ||||
| -rw-r--r-- | toolkit/content/aboutSupport.xhtml | 9 | ||||
| -rw-r--r-- | toolkit/content/jar.mn | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index b1d7ab5f6..8908a0f80 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -40,6 +40,7 @@ var snapshotFormatters = { $("application-box").textContent = data.name; $("useragent-box").textContent = data.userAgent; $("os-box").textContent = data.osVersion; + $("binary-box").textContent = Services.dirsvc.get("XREExeF", Ci.nsIFile).path; $("supportLink").href = data.supportURL; let version = AppConstants.MOZ_APP_VERSION_DISPLAY; if (data.versionArch) { diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml index 5eb64d437..5e6319182 100644 --- a/toolkit/content/aboutSupport.xhtml +++ b/toolkit/content/aboutSupport.xhtml @@ -147,6 +147,15 @@ </td> </tr> + <tr class="no-copy"> + <th class="column"> + &aboutSupport.appBasicsBinary; + </th> + + <td id="binary-box"> + </td> + </tr> + <tr id="profile-row" class="no-copy"> <th class="column"> #ifdef XP_WIN diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index e1d432cb3..5bf6440be 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -42,19 +42,15 @@ toolkit.jar: content/global/browser-content.js * content/global/buildconfig.html content/global/contentAreaUtils.js -#ifndef MOZ_FENNEC content/global/customizeToolbar.css content/global/customizeToolbar.js content/global/customizeToolbar.xul -#endif content/global/datepicker.xhtml -#ifndef MOZ_FENNEC content/global/editMenuOverlay.js * content/global/editMenuOverlay.xul content/global/finddialog.js * content/global/finddialog.xul content/global/findUtils.js -#endif content/global/filepicker.properties content/global/globalOverlay.js content/global/mozilla.xhtml |