зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central to autoland
This commit is contained in:
Коммит
286cf5c75e
2
.hgtags
2
.hgtags
|
@ -189,3 +189,5 @@ e4b11f027efc1f8c2710ae3f52487a8f10a8fb39 FIREFOX_BETA_78_BASE
|
|||
e8d1d9067328f6929a618c67f5d1e83cd9a4858f FIREFOX_NIGHTLY_80_END
|
||||
a67d5eac384369f29e88c82cd224aa319154dfd2 FIREFOX_BETA_81_BASE
|
||||
63d860f118da09320ed65431129775b4e3631ff3 FIREFOX_NIGHTLY_81_END
|
||||
ddd533d95b7443e06865ba000f1316e8c62d2a71 FIREFOX_BETA_82_BASE
|
||||
cecca8e309497b6a0e7d2ab52a4956d7e48c91f6 FIREFOX_NIGHTLY_82_END
|
||||
|
|
|
@ -1 +1 @@
|
|||
82.0a1
|
||||
83.0a1
|
||||
|
|
|
@ -1 +1 @@
|
|||
82.0a1
|
||||
83.0a1
|
||||
|
|
|
@ -10,4 +10,4 @@
|
|||
# hardcoded milestones in the tree from these two files.
|
||||
#--------------------------------------------------------
|
||||
|
||||
82.0a1
|
||||
83.0a1
|
||||
|
|
|
@ -7,7 +7,7 @@ var EXPORTED_SYMBOLS = [];
|
|||
for (let [key, val] of Object.entries({
|
||||
// Don't manually modify this line, as it is automatically replaced on merge day
|
||||
// by the gecko_migration.py script.
|
||||
WEAVE_VERSION: "1.84.0",
|
||||
WEAVE_VERSION: "1.85.0",
|
||||
|
||||
// Sync Server API version that the client supports.
|
||||
SYNC_API_VERSION: "1.5",
|
||||
|
|
|
@ -21,7 +21,7 @@ namespace mozilla {
|
|||
* via a module loader.
|
||||
*/
|
||||
struct Module {
|
||||
static const unsigned int kVersion = 82;
|
||||
static const unsigned int kVersion = 83;
|
||||
|
||||
struct CIDEntry;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче