From: Fabien Potencier Date: Thu, 3 Oct 2013 07:19:21 +0000 (+0200) Subject: bumped version to 1.14.1-DEV X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=d3b488a8b772e5f127050950c59810a867b3b002;p=web%2Fkonrad%2Ftwig.git bumped version to 1.14.1-DEV --- diff --git a/CHANGELOG b/CHANGELOG index 95c278a..a5ef3d3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 1.14.1 (2013-XX-XX) + + * n/a + * 1.14.0 (2013-10-03) * fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy diff --git a/ext/twig/php_twig.h b/ext/twig/php_twig.h index c5bf1a2..432fe29 100644 --- a/ext/twig/php_twig.h +++ b/ext/twig/php_twig.h @@ -15,7 +15,7 @@ #ifndef PHP_TWIG_H #define PHP_TWIG_H -#define PHP_TWIG_VERSION "1.14.0" +#define PHP_TWIG_VERSION "1.14.1-DEV" #include "php.h" diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php index 74f77b4..1ea5037 100644 --- a/lib/Twig/Environment.php +++ b/lib/Twig/Environment.php @@ -16,7 +16,7 @@ */ class Twig_Environment { - const VERSION = '1.14.0'; + const VERSION = '1.14.1-DEV'; protected $charset; protected $loader;