Skip to content

Commit

Permalink
Merge branch '3.1'
Browse files Browse the repository at this point in the history
* 3.1:
  [Console] Application update PHPDoc of add and register methods
  [Config] Extra tests for Config component
  Fixed bugs in names of classes and methods.
  [DoctrineBridge] Fixed php doc
  [FrameworkBundle] Fixed parameters number mismatch declaration
  [BrowserKit] Added test for followRedirect method (POST method)
  Fix the money form type render with Bootstrap3
  [BrowserKit] Uppercase the "GET" method in redirects
  [DomCrawler] Inherit the namespace cache in subcrawlers
  [WebProfilerBundle] Fixed  JSDoc parameter definition
  [HttpFoundation] HttpCache refresh stale responses containing an ETag

Conflicts:
	src/Symfony/Component/Console/Application.php
  • Loading branch information
nicolas-grekas committed Jul 26, 2016
2 parents 35ad679 + c948364 commit f0d36df
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Resources/views/Collector/time.html.twig
Expand Up @@ -160,7 +160,7 @@
/**
* Query an element with a CSS selector.
*
* @param string selector a CSS-selector-compatible query string
* @param {string} selector - a CSS-selector-compatible query string
*
* @return DOMElement|null
*/
Expand Down

0 comments on commit f0d36df

Please sign in to comment.