Merge branch '2.3' into 2.7

xabbuh · xabbuh · commit ae364baa577b · 2016-01-27T12:27:15.000+01:00
* 2.3:
  fixed CS
  [BrowserKit] Corrected HTTP_HOST logic #15398
  resolve aliases in factory services
  Remove invalid CSS white-space value
  Fix FileSystem tests on Windows
diff --git a/Resources/views/Collector/exception.css.twig b/Resources/views/Collector/exception.css.twig
@@ -7,7 +7,6 @@
     padding: 5px 4px;
     list-style-type: decimal;
     margin-left: 20px;
-    white-space: break-word;
 }
 .sf-reset #logs .traces li.error {
     font-style: normal;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`padding: 5px 4px;`
`8`	`8`	`list-style-type: decimal;`
`9`	`9`	`margin-left: 20px;`
`10`		`- white-space: break-word;`
`11`	`10`	`}`
`12`	`11`	`.sf-reset #logs .traces li.error {`
`13`	`12`	`font-style: normal;`