Merge branch '2.3' into 2.4

* 2.3: Disable 5.6 until it is stable again. Update the fixtures. [HttpKernel] fixed default TTL not applied under certain conditions Added test when TTL has expired
symfony · May 14, 2014 · af0d8ea · af0d8ea
2 parents 53afaa7 + 6db33a2
commit af0d8ea
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Tests/Fixtures/application_renderexception_doublewidth2.txt b/Tests/Fixtures/application_renderexception_doublewidth2.txt
@@ -1,10 +1,11 @@
 
 
-
-  [Exception]                 
-  コマンドの実行中にエラーが  
-  発生しました。              
-
+
+  [Exception]                
+  コマンドの実行中に         
+  エラーが発生しまし         
+  た。                       
+
 
 
 foo