зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central to autoland. a=merge on a CLOSED TREE
This commit is contained in:
Коммит
96853b352d
2
.hgtags
2
.hgtags
|
@ -183,3 +183,5 @@ f53ecf8eee2a0d2a7705d7ea3ec8682028e922a0 FIREFOX_NIGHTLY_74_END
|
|||
5b8406a0446906d7228e5d745549b50a3496dc0f FIREFOX_NIGHTLY_77_END
|
||||
e4b11f027efc1f8c2710ae3f52487a8f10a8fb39 FIREFOX_BETA_78_BASE
|
||||
702ad0fa15860f6ea37effdcb45973cc63d3125b FIREFOX_NIGHTLY_78_END
|
||||
921a30cac33b6d0760f318b6f1a2e3ce1bd687cc FIREFOX_BETA_79_BASE
|
||||
4c7e22cb6a476089657b971f2ebe333c5649a4a9 FIREFOX_NIGHTLY_79_END
|
||||
|
|
|
@ -1 +1 @@
|
|||
79.0a1
|
||||
80.0a1
|
||||
|
|
|
@ -1 +1 @@
|
|||
79.0a1
|
||||
80.0a1
|
||||
|
|
|
@ -10,4 +10,4 @@
|
|||
# hardcoded milestones in the tree from these two files.
|
||||
#--------------------------------------------------------
|
||||
|
||||
79.0a1
|
||||
80.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.81.0",
|
||||
WEAVE_VERSION: "1.82.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 = 79;
|
||||
static const unsigned int kVersion = 80;
|
||||
|
||||
struct CIDEntry;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче