summaryrefslogtreecommitdiff
path: root/docs/extensions.rst
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2017-04-05 07:26:08 -0700
committerGitHub <noreply@github.com>2017-04-05 07:26:07 -0700
commit43f86e4f6feecde9b891b4b465359d8153f60630 (patch)
treec7637f55f899741ba85d8118e405057efaf6666e /docs/extensions.rst
parent044e40b7a7549eccb197017ca45da7b88739bc6c (diff)
parentad2d90e78d4617dc2f992e0546725b39377dbd62 (diff)
downloadjinja2-43f86e4f6feecde9b891b4b465359d8153f60630.tar.gz
Merge pull request #700 from brunodoamaral/patch-1
Fixed incorrect merge in setup.py
Diffstat (limited to 'docs/extensions.rst')
0 files changed, 0 insertions, 0 deletions