geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-16 12:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.x' into 3.x

Browse Source 
* 2.x:
  bumped version to 2.11
  bumped version to 1.42
This commit is contained in:
Fabien Potencier
2019-05-17 08:24:14 +02:00
parent b2fc808c1d 3d1e5f6493
commit 65722d52b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+2 -2
View File
@@ -17,7 +17,7 @@
* bumped minimum PHP version to 7.2
* removed PSR-0 classes
* 2.10.1 (2019-XX-XX)
* 2.11.0 (2019-XX-XX)
* n/a
@@ -248,7 +248,7 @@
* improved the performance of the filesystem loader
* removed features that were deprecated in 1.x
* 1.41.1 (2019-XX-XX)
* 1.42.0 (2019-XX-XX)
* fixed a PHP fatal error when calling a macro imported in a block in a nested block
* fixed a PHP fatal error when calling a macro imported in the template in another macro