Skip to content

Commit

Permalink
115.11.0 rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex313031 committed May 19, 2024
1 parent c5a8f5c commit 28c3e7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 3 additions & 3 deletions app/profile/firefox.js
Original file line number Diff line number Diff line change
Expand Up @@ -2304,7 +2304,7 @@ pref("browser.migrate.preferences-entrypoint.enabled", true);
pref("browser.device-migration.help-menu.hidden", false);

pref("extensions.pocket.api", "");
pref("extensions.pocket.bffApi", "firefox-api-proxy.cdn.mozilla.net");
pref("extensions.pocket.bffApi", "");
pref("extensions.pocket.bffRecentSaves", false);
pref("extensions.pocket.enabled", false);
pref("extensions.pocket.oAuthConsumerKey", "");
Expand Down Expand Up @@ -2531,9 +2531,9 @@ pref("devtools.command-button-rulers.enabled", false);
pref("devtools.command-button-measure.enabled", false);
pref("devtools.command-button-noautohide.enabled", false);
pref("devtools.command-button-errorcount.enabled", true);
#ifndef MOZILLA_OFFICIAL
// #ifndef MOZILLA_OFFICIAL
pref("devtools.command-button-experimental-prefs.enabled", true);
#endif
// #endif

// Inspector preferences
// Enable the Inspector
Expand Down
2 changes: 0 additions & 2 deletions browser/installer/package-manifest.in
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,7 @@
@BINPATH@/browser/VisualElements/PrivateBrowsing_150.png
@BINPATH@/browser/VisualElements/PrivateBrowsing_70.png
#else
#ifndef XP_MACOSX
@BINPATH@/@MOZ_APP_NAME@-bin
#endif
@BINPATH@/@MOZ_APP_NAME@
#endif
@RESPATH@/application.ini
Expand Down

0 comments on commit 28c3e7f

Please sign in to comment.