From: David Lord <davidism@gmail.com>
Date: Tue, 31 Oct 2017 15:51:53 +0000 (-0700)
Subject: Merge branch 'master' into NATIVE_TYPES
X-Git-Tag: 2.10~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a7a263bc0ff6ea68ff3651d166f4077ed03c3c8;p=thirdparty%2Fjinja.git

Merge branch 'master' into NATIVE_TYPES
---

6a7a263bc0ff6ea68ff3651d166f4077ed03c3c8
diff --cc CHANGES
index 5c45b480,21a60ecf..7481a61a
--- a/CHANGES
+++ b/CHANGES
@@@ -42,8 -40,22 +42,23 @@@ Version 2.1
  .. _#665: https://github.com/pallets/jinja/pull/665
  .. _#685: https://github.com/pallets/jinja/pull/685
  .. _#692: https://github.com/pallets/jinja/pull/692
 +.. _#708: https://github.com/pallets/jinja/pull/708
  
+ Version 2.9.7
+ -------------
+ 
+ (bugfix release, in development)
+ 
+ - ``tojson`` filter marks output as safe to match documented behavior.
+   (`#718`_)
+ - Resolved a bug where getting debug locals for tracebacks could
+   modify template context.
+ - Fixed a bug where having many `{% elif ... %}` blocks resulted in a
+   "too many levels of indentation" error.  These blocks now compile to
+   native `elif ..:` instead of `else: if ..:`  (#759)
+ 
+ .. _#718: https://github.com/pallets/jinja/pull/718
+ 
  Version 2.9.6
  -------------
  (bugfix release, released on April 3rd 2017)