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.10'

Browse source 
* 1.10:
  [Docs] Add missing references in CONFLICT.md
This commit is contained in:
Mateusz Zalewski 2021-12-13 09:30:39 +01:00
commit c7d508fe52
No known key found for this signature in database
GPG key ID: 9BECA0BB71612E52
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CONFLICTS.md
View file

@ -6,6 +6,8 @@ references related issues.
- `symfony/password-hasher": "^6.0`:
Symfony in version 5.3 change password hashing logic, and in version 6.0 they removed BC layer
References: https://github.com/Sylius/Sylius/pull/13358
- `doctrine/doctrine-bundle:2.3.0`: