From: David Lord <davidism@gmail.com>
Date: Fri, 4 Oct 2019 19:01:37 +0000 (-0700)
Subject: Merge pull request #828 from chamini2/trim-more
X-Git-Tag: 2.11.0~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f179cf8c715f378b1b9d5600c630a952e95536a9;p=thirdparty%2Fjinja.git

Merge pull request #828 from chamini2/trim-more

Add chars option to trim
---

f179cf8c715f378b1b9d5600c630a952e95536a9
diff --cc CHANGES.rst
index 888f9d91,fe99937d..a8147b50
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -22,17 -22,10 +22,19 @@@ Unrelease
  -   Int and float literals can be written with the '_' separator for
      legibility, like 12_345. :pr:`923`
  -   Fix a bug causing deadlocks in ``LRUCache.setdefault``. :pr:`1000`
+ -   The ``trim`` filter takes an optional string of characters to trim.
+     :pr:`828`
  
  
 +Version 2.10.3
 +--------------
 +
 +Released 2019-10-24
 +
 +-   Fix a typo in Babel entry point in ``setup.py`` that was preventing
 +    installation.
 +
 +
  Version 2.10.2
  --------------