From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 26 May 2014 00:01:07 +0000 (+0200)
Subject: updated CHANGELOG
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4a7ef0ce0f4ca8d76a302a6d409f526a830978e1;p=web%2Fkonrad%2Ftwig.git

updated CHANGELOG
---

diff --git a/CHANGELOG b/CHANGELOG
index 48043e7..64fb31c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.15.2 (2014-XX-XX)
 
+ * fixed inheritance in a 'use'-hierarchy
  * removed the __toString policy check when the sandbox is disabled
  * fixed recursively calling blocks in templates with inheritance