Merge branch 'origin/master'

Conflicts:
	docs/ru/tags/raw.md
This commit is contained in:
bzick 2014-08-08 16:04:37 +04:00
commit bb8d351e93
1 changed files with 1 additions and 1 deletions

View File

@ -24,5 +24,5 @@
{my_func page=5} {* escape *}
{my_func:raw page=5} {* unescape *}
...
{/autoescate}
{/autoescape}
```