mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-23 21:01:08 +00:00
Merge mozilla-central to autoland. CLOSED TREE
This commit is contained in:
commit
5fa22c9ce8
2
.hgtags
2
.hgtags
@ -311,3 +311,5 @@ c9a192c047cde29cd4369733df6c27c9326990e9 FIREFOX_BETA_131_BASE
|
||||
2764529cc7a6f24781273f93d7af9805e1f45876 FIREFOX_NIGHTLY_131_END
|
||||
91eddc0bb6d90cdabdf5b62e6cbc91be08013a4f FIREFOX_BETA_132_BASE
|
||||
eaad836f0a492448489e0ffc73f261abda8b4b85 FIREFOX_NIGHTLY_132_END
|
||||
f8047162f57463ca16a04358355c2a6be8e18037 FIREFOX_BETA_133_BASE
|
||||
8dae036c3388e3a50a8337590d62780805b4c680 FIREFOX_NIGHTLY_133_END
|
||||
|
2
CLOBBER
2
CLOBBER
@ -22,4 +22,4 @@
|
||||
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
|
||||
# don't change CLOBBER for WebIDL changes any more.
|
||||
|
||||
Bug 1921707 - modified build files in third_party/libwebrtc and third_party/abseil-cpp
|
||||
Merge day clobber 2024-10-28
|
@ -1 +1 @@
|
||||
133.0a1
|
||||
134.0a1
|
||||
|
@ -1 +1 @@
|
||||
133.0a1
|
||||
134.0a1
|
||||
|
@ -10,4 +10,4 @@
|
||||
# hardcoded milestones in the tree from these two files.
|
||||
#--------------------------------------------------------
|
||||
|
||||
133.0a1
|
||||
134.0a1
|
||||
|
@ -1 +1 @@
|
||||
133.0a1
|
||||
134.0a1
|
||||
|
@ -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.135.0";
|
||||
export const WEAVE_VERSION = "1.136.0";
|
||||
|
||||
// Sync Server API version that the client supports.
|
||||
export const SYNC_API_VERSION = "1.5";
|
||||
|
Loading…
Reference in New Issue
Block a user