mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 09:02:12 +00:00
Merge branch '1.6'
* 1.6: [Psalm] Temporary suppress of false possitive SyliusGridBundle downgrade lock
This commit is contained in:
commit
04be8bfe64
1 changed files with 1 additions and 0 deletions
|
|
@ -179,6 +179,7 @@
|
|||
"conflict": {
|
||||
"sylius/grid-bundle": "1.7.4",
|
||||
"symfony/symfony": "3.4.7",
|
||||
"sylius/grid-bundle": "1.7.4",
|
||||
"twig/twig": "2.6.1"
|
||||
},
|
||||
"suggest": {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue