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 4eb5d6a commit 019dcc9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
"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-admin-ui": "^0.5.0",
"automattic/jetpack-autoloader": "^4.0.0",
"automattic/jetpack-autoloader": "^5.0.0-alpha",
"automattic/jetpack-backup-helper-script-manager": "^0.3.0",
"automattic/jetpack-composer-plugin": "^3.0.0",
"automattic/jetpack-config": "^3.0.0",
"automattic/jetpack-connection": "^6.0.1",
"automattic/jetpack-my-jetpack": "^5.0.1",
"automattic/jetpack-sync": "^4.0.0",
"automattic/jetpack-status": "^5.0.0"
"automattic/jetpack-status": "^5.0.1-alpha"
},
"require-dev": {
"automattic/jetpack-changelogger": "^5.0.0",
"automattic/jetpack-changelogger": "^5.1.0-alpha",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/wordbless": "@dev"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@automattic/format-currency": "1.0.1",
"@automattic/jetpack-analytics": "^0.1.33",
"@automattic/jetpack-api": "^0.17.18",
"@automattic/jetpack-components": "^0.61.0",
"@automattic/jetpack-components": "^0.61.1-alpha",
"@automattic/jetpack-connection": "^0.35.18",
"@tanstack/react-query": "5.20.5",
"@wordpress/api-fetch": "7.11.0",
Expand Down

0 comments on commit 019dcc9

Please sign in to comment.