Merge pull request #5583 from Automattic/develop

Staging release v20230514.2
Automattic · May 14, 2024 · e2d38c0 · e2d38c0
2 parents f7e9de8 + bfbef0f
commit e2d38c0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "http-concat"]
 	path = http-concat
 	url = https://github.com/Automattic/nginx-http-concat.git
-[submodule "shared-plugins/jetpack-force-2fa"]
-	path = shared-plugins/jetpack-force-2fa
-	url = https://github.com/Automattic/jetpack-force-2fa.git
 [submodule "lightweight-term-count-update"]
 	path = lightweight-term-count-update
 	url = https://github.com/Automattic/lightweight-term-count-update

diff --git a/shared-plugins/jetpack-force-2fa b/shared-plugins/jetpack-force-2fa
diff --git a/vip-helpers/vip-utils.php b/vip-helpers/vip-utils.php
@@ -1261,7 +1261,6 @@ function wpcom_vip_can_use_shared_plugin( $plugin ) {
 	// Array of shared plugins we are not deprecating
 	$protected_shared_plugins = array(
 		'two-factor',
-		'jetpack-force-2fa',
 	);
 
 	if ( ! defined( 'WPCOM_VIP_DISABLE_SHARED_PLUGINS' ) ) {