Skip to content

Commit

Permalink
Merge branch 'master' into release/2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
hansmorb committed Dec 12, 2024
2 parents fcb787b + 6307143 commit 6c6acf6
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

],
"require": {
"php": ">=7.3",
"php": ">=7.4",
"cmb2/cmb2": "^2.10.1",
"mustardbees/cmb-field-select2": "^3.0.4",
"geocoder-php/nominatim-provider": "^5.7",
Expand Down
66 changes: 33 additions & 33 deletions composer.lock

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

24 changes: 12 additions & 12 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"devDependencies": {
"@babel/preset-env": "^7.26.0",
"@wordpress/env": "^10.12.0",
"@wordpress/env": "^10.13.0",
"commons-api": "git+https://github.com/wielebenwir/commons-api.git",
"cypress": "^13.16.0",
"cypress": "^13.16.1",
"editorconfig": "^2.0.0",
"grunt": "^1.6.1",
"grunt-babel": "^8.0.0",
Expand All @@ -25,7 +25,7 @@
"grunt-contrib-watch": "^1.1.0",
"grunt-dart-sass": "^2.0.1",
"matchdep": "^2.0.0",
"sass": "^1.81.0"
"sass": "^1.82.0"
},
"scripts": {
"start": "composer install --ignore-platform-reqs && npm install && npm run dist",
Expand Down

0 comments on commit 6c6acf6

Please sign in to comment.