kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '1.7' into 1.8

Browse source 
* 1.7:
  Remove nikic/php-parser as a conflict
This commit is contained in:
Mateusz Zalewski 2020-11-03 08:13:11 +01:00
commit 996666c12f
No known key found for this signature in database
GPG key ID: 9BECA0BB71612E52
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
composer.json
View file

@ -192,7 +192,6 @@
"sylius/user-bundle": "self.version"
},
"conflict": {
"nikic/php-parser":"^4.7",
"doctrine/inflector": "^1.4",
"phpspec/prophecy": "1.11.0",
"sylius/grid-bundle": "1.7.4",