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

Merge branch '3.4'

Browse Source 
* 3.4:
  Fix merge
This commit is contained in:
Nicolas Grekas 2017-11-05 18:13:32 +01:00
commit 145587c614
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/Component/Form/composer.json
View File

@ -33,7 +33,7 @@
"symfony/http-kernel": "~3.4|~4.0",
"symfony/security-csrf": "~3.4|~4.0",
"symfony/translation": "~3.4|~4.0",
"symfony/var-dumper": "~3.4-beta3|~4.0"
"symfony/var-dumper": "~3.4-beta3|~4.0-beta3"
},
"conflict": {
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",