Skip to content

Commit

Permalink
Merge branch 'master' of github.com:mixerapi/mixerapi-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
cnizzardini committed Aug 25, 2022
2 parents bc27326 + c076292 commit f540e9e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"ext-openssl": "*",
"ext-simplexml": "*",
"ext-xml": "*",
"adbario/php-dot-notation": "^2.2",
"adbario/php-dot-notation": "^2.3",
"cakephp/cakephp": "^4.2",
"cakephp/migrations": "^3.0",
"cakephp/plugin-installer": "^1.3",
Expand Down
30 changes: 14 additions & 16 deletions composer.lock

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

2 changes: 1 addition & 1 deletion plugins/collection-view/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require": {
"php": "^8.0",
"cakephp/cakephp": "^4.2",
"adbario/php-dot-notation": "^2.2"
"adbario/php-dot-notation": "^2.3"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit f540e9e

Please sign in to comment.