Merge branch '2.6' into 2.7
* 2.6: [minor] composer.json fix [minor] composer.json fix Conflicts: src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Templating/composer.json
This commit is contained in:
commit
65e4a5aaf4