10000 Merge branch '2.6' into 2.7 · rubenrua/symfony@65e4a5a · GitHub
[go: up one dir, main page]
Skip to content

Commit 65e4a5a

Browse files
nicolas-grekasnicolas-grekas
committed
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
2 parents d4802aa + 76e736e commit 65e4a5a

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)
    0