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

Merge branch '2.8' into 3.1 

* 2.8:
  fixed composer.json
This commit is contained in:
Fabien Potencier 2017-01-27 16:21:39 -08:00
parent e8895ad102 4b5930ca44
commit f904f0406d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -89,12 +89,12 @@
"egulias/email-validator": "~1.2,>=1.2.1",
"symfony/polyfill-apcu": "~1.1",
"symfony/security-acl": "~2.8|~3.0",
"phpdocumentor/reflection-docblock": "^3.0"
"phpdocumentor/reflection-docblock": "^3.0",
"sensio/framework-extra-bundle": "^3.0.2"
},
"conflict": {
"phpdocumentor/reflection-docblock": "<3.0",
"phpdocumentor/type-resolver": "<0.2.0",
"sensio/framework-extra-bundle": "^3.0.2"
},
"provide": {
"psr/cache-implementation": "1.0"