summaryrefslogtreecommitdiff
path: root/docs/intro.rst
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2014-01-10 10:43:55 +0000
committerArmin Ronacher <armin.ronacher@active-4.com>2014-01-10 10:43:55 +0000
commit27ffd01f95cad7740497a32b22e4ef9d29762162 (patch)
treec497581642fef3ca1a56bad8ad6450d96e18edf8 /docs/intro.rst
parentf6c6fe4382dd54ea8ace77300e387652bfbbde6b (diff)
parent5662125f794f41ac73849a95a9e572e0e5a98b4e (diff)
downloadjinja2-27ffd01f95cad7740497a32b22e4ef9d29762162.tar.gz
Merge branch '2.7-maintenance'
Diffstat (limited to 'docs/intro.rst')
0 files changed, 0 insertions, 0 deletions