This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.
symfony/src/Symfony/Bundle/WebProfilerBundle/Controller
Nicolas Grekas 78a08f3a68 Merge branch '2.8' into 3.0
* 2.8:
  Fix merge
  [Process] Fix running tests on HHVM>=3.8
  [Form] Improved performance of ChoiceType and its subtypes
  Removed an object as route generator argument

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
	src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
2015-12-30 19:45:14 +01:00
..
ExceptionController.php [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback 2015-03-11 17:56:24 +01:00
ProfilerController.php Merge branch '2.8' into 3.0 2015-12-30 19:45:14 +01:00
RouterController.php Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)" 2015-03-11 15:41:28 +01:00