Merge branch 'origin/master'

Conflicts:
	CHANGELOG.md
	docs/tags/raw.md
	src/Fenom/Compiler.php
	src/Fenom/Render.php
	src/Fenom/Template.php
This commit is contained in:
Ivan Shalganov
2014-04-10 00:11:04 +04:00
7 changed files with 31 additions and 16 deletions

View File

@ -976,4 +976,4 @@ class Compiler
$scope->tpl->escape = $scope["escape"];
}
}
}