Merge branch '1.6'

* 1.6:
  [Psalm] Temporary suppress of false possitive
  SyliusGridBundle downgrade lock
This commit is contained in:
Mateusz Zalewski 2020-01-08 13:38:23 +01:00
commit 04be8bfe64
No known key found for this signature in database
GPG key ID: 9BECA0BB71612E52

View file

@ -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": {