Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into prerelease
Browse files Browse the repository at this point in the history
  • Loading branch information
tbradsha authored and matticbot committed Nov 18, 2024
1 parent 767e876 commit 3da4a3f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-assets": "^3.0.0",
"automattic/jetpack-assets": "^4.0.0-alpha",
"automattic/jetpack-connection": "^6.0.1",
"automattic/jetpack-constants": "^3.0.0",
"automattic/jetpack-plans": "^0.5.0",
"automattic/jetpack-redirect": "^3.0.0",
"automattic/jetpack-status": "^5.0.0",
"automattic/jetpack-status": "^5.0.1-alpha",
"automattic/jetpack-sync": "^4.0.0"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0",
"automattic/jetpack-changelogger": "^5.1.0-alpha",
"automattic/wordbless": "@dev"
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"dependencies": {
"@automattic/jetpack-analytics": "^0.1.33",
"@automattic/jetpack-components": "^0.61.0",
"@automattic/jetpack-components": "^0.61.1-alpha",
"@automattic/jetpack-shared-extension-utils": "^0.15.17",
"@wordpress/block-editor": "14.6.0",
"@wordpress/components": "28.11.0",
Expand Down

0 comments on commit 3da4a3f

Please sign in to comment.