Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit b6efbaa8a41a · 2016-01-27T12:34:40.000+01:00
* 2.7:
  fixed CS
  [BrowserKit] Corrected HTTP_HOST logic #15398
  resolve aliases in factories
  resolve aliases in factory services
  Remove invalid CSS white-space value
  Fix FileSystem tests on Windows
  [Form] ArrayChoiceList can now deal with a null in choices
diff --git a/Resources/public/css/exception.css b/Resources/public/css/exception.css
@@ -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;`