Merge branch '2.8' into 3.4
* 2.8:
This commit is contained in:
commit
fd29c8c204
@ -31,7 +31,7 @@
|
||||
"psr/log": "~1.0"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/security-csrf": "<2.7.48 || >=2.8.0,<2.8.41 || >=3.0.0"
|
||||
"symfony/security-csrf": ">=2.8.0,<2.8.41 || >=3.0.0,<3.3.17 || >=3.4.0,<3.4.11 || >=4.0.0,<4.0.11"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/security-csrf": "For using tokens to protect authentication/logout attempts",
|
||||
|
Reference in New Issue
Block a user