summaryrefslogtreecommitdiff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2020-03-30 11:40:59 -0700
committerDavid Lord <davidism@gmail.com>2020-03-30 11:40:59 -0700
commit0a370316c6a4f0d034da5f90df5a671a32a8e376 (patch)
treea291ea51000c3d9aa7d32776d96ce609b68473aa /CHANGES.rst
parentc074fd5ecb7af70b2f864c9ef545fffd38dc203b (diff)
parent786867a47cdff625ebdab9fa1dbfe65a0c7e1924 (diff)
downloadjinja2-0a370316c6a4f0d034da5f90df5a671a32a8e376.tar.gz
Merge branch '2.11.x'
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index c2f51f5..580d411 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -32,6 +32,10 @@ Unreleased
when using Pytest. Due to the difficulty in supporting Python 2 and
:pep:`451` simultaneously, the changes are reverted until 3.0.
:pr:`1182`
+- Fix line numbers in error messages when newlines are stripped.
+ :pr:`1178`
+- The special ``namespace()`` assignment object in templates works in
+ async environments. :issue:`1180`
Version 2.11.1