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

Merge branch '2.6' into 2.7 

* 2.6:
  [FrameworkBundle] move Routing dep up to make tests pass

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/composer.json
This commit is contained in:
Fabien Potencier 2015-02-22 12:46:06 +01:00
parent bbd4a1e2ce 51a22406a7
commit 346f347aff
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/FrameworkBundle/composer.json
View File

@ -24,7 +24,7 @@
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
"symfony/http-kernel": "~2.7|~3.0.0",
"symfony/filesystem": "~2.3|~3.0.0",
"symfony/routing": "~2.5|~3.0.0",
"symfony/routing": "~2.6,>2.6.4|~3.0.0",
"symfony/security-core": "~2.6|~3.0.0",
"symfony/security-csrf": "~2.6|~3.0.0",
"symfony/stopwatch": "~2.3|~3.0.0",