Merge mozilla-central to autoland

Brli · Sep 21, 2020 · e1b767e · e1b767e
2 parents 69b4cde + 5d9c14f
commit e1b767e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/.hgtags b/.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
diff --git a/browser/config/version.txt b/browser/config/version.txt
@@ -1 +1 @@
-82.0a1
+83.0a1
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
@@ -1 +1 @@
-82.0a1
+83.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-82.0a1
+83.0a1
diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js
@@ -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",

diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
@@ -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;
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ @@
     # hardcoded milestones in the tree from these two files.
     #--------------------------------------------------------
-.0a1
+.0a1