diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.0

Browse Source 
* 3.4:
  [SecurityBundle] update conflict rule
This commit is contained in:
Nicolas Grekas 2018-05-25 11:05:43 +02:00
commit 34bb84be98
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/SecurityBundle/composer.json
View File

@ -44,7 +44,7 @@
"twig/twig": "~1.34|~2.4" "twig/twig": "~1.34|~2.4"
}, },
"conflict": { "conflict": {
"symfony/security": "4.1.0-beta1", "symfony/security": "4.1.0-beta1,4.1.0-beta2",
"symfony/var-dumper": "<3.4", "symfony/var-dumper": "<3.4",
"symfony/event-dispatcher": "<3.4", "symfony/event-dispatcher": "<3.4",
"symfony/framework-bundle": "<3.4", "symfony/framework-bundle": "<3.4",