ext.py
2.35 KB
-
Merge branch 'master' into jinja-ext · 1910ad9a
Conflicts: pipeline/jinja2/ext.py tests/tests/__init__.py tests/tests/test_jinja2.py
Timothée Peignier committed
Conflicts: pipeline/jinja2/ext.py tests/tests/__init__.py tests/tests/test_jinja2.py