Merge release/25.6 into trunk (#21533)

wordpress-mobile · Dec 16, 2024 · 4495d1a · 4495d1a
2 parents 34c994a + 8d88d1c
commit 4495d1a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+25.7
+-----
+
+
 25.6
 -----
 

diff --git a/WordPress/jetpack_metadata/release_notes.txt b/WordPress/jetpack_metadata/release_notes.txt
@@ -1,5 +1,2 @@
-This month, we've:
-- Fixed broken social media icons in Jetpack Social
-- Fixed some Dark Mode bugs
-- We've brought the experimental editor to Android – give it a try and let us know what you think!
-- Adjusted how users log into WordPress.com – this fixes a long-standing issue where you couldn't log in if you used a Passkey.
+
+
diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt
@@ -1,4 +1,2 @@
-This month, we've:
-- Fixed some Dark Mode bugs
-- We've brought the experimental editor to Android – give it a try and let us know what you think!
-- Adjusted how users log into WordPress.com – this fixes a long-standing issue where you couldn't log in if you used a Passkey.
+
+
diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml
@@ -963,6 +963,7 @@
     <string name="experimental_features_screen_title">Experimental Features</string>
     <string name="experimental_block_editor">Experimental block editor</string>
     <string name="experimental_block_editor_theme_styles">Experimental block editor styles</string>
+    <string name="experimental_per_app_language_prefs">Experimental per-app language preferences</string>
 
     <!-- Debug settings -->
     <string name="preference_open_debug_settings" translatable="false">Debug Settings</string>

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
-versionName=25.5
-versionCode=1449
+versionName=25.6-rc-1
+versionCode=1450
-Original file line number
+Diff line change
@@ -1,5 +1,9 @@
     *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
+.7
+    -----
 .6
     -----
@@ Expand Down @@