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/FrameworkBundle/Console/Descriptor
Fabien Potencier de6f11d042 Merge branch '2.7'
* 2.7:
  [WIP] Made help information of commands more consistent
  [HttpKernel] deprecated ContainerAwareHttpKernel
  Deprecate the translator implementation in the Validator component
  [2.6] Added internal annotation on Descriptor classes
  Made CLI help consistent
  Made help information consistent

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
	src/Symfony/Component/Validator/composer.json
2015-01-06 18:50:37 +01:00
..
Descriptor.php Merge branch '2.7' 2015-01-06 18:50:37 +01:00
JsonDescriptor.php Merge branch '2.7' 2015-01-06 18:50:37 +01:00
MarkdownDescriptor.php [2.6] Added internal annotation on Descriptor classes 2015-01-05 22:39:05 +01:00
TextDescriptor.php Merge branch '2.7' 2015-01-06 18:50:37 +01:00
XmlDescriptor.php minor #13274 [2.6] Added internal annotation on Descriptor classes (saro0h) 2015-01-06 07:49:44 +01:00