Skip to content

Commit

Permalink
Merge branch 'develop' into release/2.1.5
Browse files Browse the repository at this point in the history
* develop:
  NPM(deps): Bump react-error-boundary from 4.0.13 to 4.1.2
  Composer(deps): Bump newfold-labs/wp-module-coming-soon
  NPM(deps): Bump react-router-dom from 6.26.2 to 6.28.0
  NPM Dev(deps-dev): Bump @wordpress/env from 10.8.0 to 10.11.0
  NPM Dev(deps-dev): Bump tailwindcss from 3.4.13 to 3.4.14
  NPM(deps): Bump @wordpress/element from 6.8.0 to 6.11.0
  Composer Dev(deps-dev): Bump wp-phpunit/wp-phpunit from 6.6.2 to 6.7.0

# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
circlecube committed Nov 14, 2024
2 parents bcd9f4e + 8b2ccc8 commit b3a60cb
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"doctrine/inflector": "1.2.0 as 1.3.1",
"newfold-labs/wp-module-activation": "^1.0.5",
"newfold-labs/wp-module-atomic": "^1.3",
"newfold-labs/wp-module-coming-soon": "^1.2.6",
"newfold-labs/wp-module-coming-soon": "^1.3.0",
"newfold-labs/wp-module-context": "^1.0.1",
"newfold-labs/wp-module-data": "^2.6.6",
"newfold-labs/wp-module-deactivation": "^1.2.3",
Expand All @@ -82,6 +82,6 @@
"newfold-labs/wp-php-standards": "^1.2.4",
"roave/security-advisories": "dev-latest",
"wp-cli/i18n-command": "^2.6.2",
"wp-phpunit/wp-phpunit": "^6.6.2"
"wp-phpunit/wp-phpunit": "^6.7.0"
}
}
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b3a60cb

Please sign in to comment.