Skip to content

Commit

Permalink
Merge 4.x into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Jun 27, 2022
2 parents bd2879e + b812dc6 commit 12df401
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"homepage": "https://docs.sonata-project.org/projects/SonataMediaBundle",
"require": {
"php": "^7.4 || ^8.0",
"doctrine/persistence": "^2.0",
"doctrine/persistence": "^2.0 || ^3.0",
"imagine/imagine": "^1.3",
"knplabs/gaufrette": "^0.10",
"nyholm/psr7": "^1.4",
Expand Down
2 changes: 1 addition & 1 deletion rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* file that was distributed with this source code.
*/

/*
/*
* DO NOT EDIT THIS FILE!
*
* It's auto-generated by sonata-project/dev-kit package.
Expand Down

0 comments on commit 12df401

Please sign in to comment.