Please sign in to comment.
Merge branch '2.1' into 2.2
* 2.1: Options small typo [Console] fixed unparsed StringInput tokens [TwigBridge] fixed trans twig extractor [DomCrawler] fix handling of schemes by Link::getUri() [Console] Fixed comment [TwigBridge] fixed the translator extractor that were not trimming the text in trans tags (closes #7056) Fixed handling absent href attribute in base tag added a DebuClassLoader::findFile() method to make the wrapping less invasive fixed CHANGELOG bumped Symfony version to 2.1.9-DEV updated VERSION for 2.1.8 updated CHANGELOG for 2.1.8 StringInput resets the given options. Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
- Loading branch information...
Showing with 18 additions and 3 deletions.