From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 15 Mar 2014 10:50:05 +0000 (+0100)
Subject: updated CHANGELOG
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=dab8d90755a7c1a54cd20be5098f5b5bf3346d9b;p=web%2Fkonrad%2Ftwig.git

updated CHANGELOG
---

diff --git a/CHANGELOG b/CHANGELOG
index a20fabb..613e989 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 * 1.15.2 (2014-XX-XX)
 
- * n/a
+ * fixed recursively calling blocks in templates with inheritance
 
 * 1.15.1 (2014-02-13)