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

Merge branch '2.3' into 2.6

Browse Source 
* 2.3:
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json
This commit is contained in:
Nicolas Grekas 2015-02-24 14:39:25 +01:00
commit decd82eef7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/HttpFoundation/composer.json
View File

@ -19,7 +19,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0.0"
"symfony/phpunit-bridge": "~2.7",
"symfony/expression-language": "~2.4"
},
"autoload": {

2
src/Symfony/Component/Templating/composer.json
View File

@ -19,7 +19,7 @@
"php": ">=5.3.3"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0.0"
"symfony/phpunit-bridge": "~2.7"
"psr/log": "~1.0"
},
"suggest": {