8000 Merge branch '4.4' into 5.0 · Simperfit/symfony@000ffb2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 000ffb2

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.0
* 4.4: fix merge
2 parents 955752b + 3ae3244 commit 000ffb2

File tree

1 file changed

+1
-1
lines changed
  • src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config

1 file changed

+1
-1
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ session_setflash:
2020

2121
injected_flashbag_session_setflash:
2222
path: injected_flashbag/session_setflash/{message}
23-
defaults: { _controller: TestBundle:InjectedFlashbagSession:setFlash}
23+
defaults: { _controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller\InjectedFlashbagSessionController::setFlashAction}
2424

2525
session_showflash:
2626
path: /session_showflash

0 commit comments

Comments
 (0)
0