Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland on a CLOSED TREE

Browse Source
This commit is contained in:
Iulian Moraru 2023-06-05 18:55:43 +03:00
commit 5ad2eef571
7 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgtags
View File

@ -261,3 +261,5 @@ f2178beb09db4f3548827808718f1ea1f2892fc5 FIREFOX_NIGHTLY_112_END
8cec209cd17ebd93dad30af4c02a2b6b0cc0e3b0 FIREFOX_NIGHTLY_113_END
25209607dc0b253635ead03eff51fdc10a62e659 FIREFOX_BETA_114_BASE
715f01d61df8627117e6aefca540f0c1bba45011 FIREFOX_NIGHTLY_114_END
f8fa7749f7bdc93fa3491918a4e8b0fb4db659eb FIREFOX_BETA_115_BASE
8f983388de8ac77550eb07422e61c0444e7b8eb5 FIREFOX_NIGHTLY_115_END

2
CLOBBER
View File

@ -23,4 +23,4 @@
# don't change CLOBBER for WebIDL changes any more.
Bug 1824744 - Update to ICU 73 requires clobber
Merge day clobber 2023-06-05

2
browser/config/version.txt
View File

@ -1 +1 @@
115.0a1
116.0a1

2
browser/config/version_display.txt
View File

@ -1 +1 @@
115.0a1
116.0a1

2
config/milestone.txt
View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
115.0a1
116.0a1

1
dom/media/webrtc/tests/mochitests/mochitest_peerconnection.ini
View File

@ -160,6 +160,7 @@ skip-if =
os == 'win' # no ipv6 support on windows testers (bug 1710706)
scheme=http
[test_peerConnection_glean.html]
disabled = bug 1832459
[test_peerConnection_iceFailure.html]
skip-if = true # (Bug 1180388 for win, mac and linux), android(Bug 1189784), Bug 1180388
scheme=http

2
services/sync/modules/constants.sys.mjs
View File

@ -4,7 +4,7 @@
// Don't manually modify this line, as it is automatically replaced on merge day
// by the gecko_migration.py script.
export const WEAVE_VERSION = "1.117.0";
export const WEAVE_VERSION = "1.118.0";
// Sync Server API version that the client supports.
export const SYNC_API_VERSION = "1.5";