From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 26 Jul 2011 15:36:37 +0000 (+0200)
Subject: updated CHANGELOG
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=d67832ea5d66e000dce401e5b156bc9df9b28584;p=web%2Fkonrad%2Ftwig.git

updated CHANGELOG
---

diff --git a/CHANGELOG b/CHANGELOG
index cdf0530..1c1dc20 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.1.2
 
+ * fixed inheritance when using conditional parents
  * fixed compilation of templates when the body of a child template is not empty
  * fixed output when a macro throws an exception
  * fixed a parsing problem when a large chunk of text is enclosed in a comment tag