]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fff365e 7c83462)
Merge pull request #312 from fengsp/master
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jun 2014 16:18:27 +0000 (22:18 +0600)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jun 2014 16:18:27 +0000 (22:18 +0600)
Removed duplication from ignored_tokens in lexer

1  2 
jinja2/lexer.py patch | diff1 | diff2 | blob | history

diff --cc jinja2/lexer.py
Simple merge
Mirror of https://github.com/pallets/jinja.git