Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 17217dfe16a0 · 2016-10-28T10:10:49.000+02:00
* 2.7:
  Compatibility with Twig 1.27
  Enhance GAE compat by removing some realpath()
  bumped Symfony version to 2.7.21
  updated VERSION for 2.7.20
  update CONTRIBUTORS for 2.7.20
  updated CHANGELOG for 2.7.20
  [SecurityBundle] Fix twig-bridge lowest dep
diff --git a/Intl.php b/Intl.php
@@ -244,7 +244,7 @@ public static function getIcuStubVersion()
      */
     public static function getDataDirectory()
     {
-        return realpath(__DIR__.'/Resources/data');
+        return __DIR__.'/Resources/data';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ public static function getIcuStubVersion()`
`244`	`244`	`*/`
`245`	`245`	`public static function getDataDirectory()`
`246`	`246`	`{`
`247`		`- return realpath(__DIR__.'/Resources/data');`
	`247`	`+ return __DIR__.'/Resources/data';`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`/**`