Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '0.4' into 0.5

Conflicts:
	lib/xjst/helpers/serializer.js
	package.json
  • Loading branch information...
commit 2fdf61d1c9d69b3aa7bfca3da1581aac1da72c97 2 parents 4f4ddea + 24b4cd3
@indutny indutny authored
Showing with 1 addition and 0 deletions.
  1. +1 −0  lib/xjst/helpers/serializer.js
View
1  lib/xjst/helpers/serializer.js
@@ -352,6 +352,7 @@ Serializer.prototype.render = function render(ast, type) {
].concat(
'{',
res.join(''),
+ '__$ctx.__$a=0;',
'};\n'
).join('')
};
Please sign in to comment.
Something went wrong with that request. Please try again.