Skip to content

Commit e6146ac

Browse files
authored
Merge branch 'WordPress:trunk' into trunk
2 parents 068225f + 59d01e9 commit e6146ac

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

src/wp-admin/includes/update-core.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,8 +900,12 @@
900900
// 7.0.2
901901
'wp-includes/collaboration',
902902
'wp-includes/collaboration.php',
903-
'wp-includes/js/dist/sync.js',
904-
'wp-includes/js/dist/sync.min.js',
903+
/*
904+
* Added back in 7.1.
905+
*
906+
* 'wp-includes/js/dist/sync.js',
907+
* 'wp-includes/js/dist/sync.min.js',
908+
*/
905909
);
906910

907911
/**

src/wp-includes/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @global string $wp_version
1818
*/
19-
$wp_version = '7.1-beta1-62760-src';
19+
$wp_version = '7.1-beta2-src';
2020

2121
/**
2222
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

0 commit comments

Comments
 (0)