Backport not escaping SafeString; it's a bug.

mozilla · Mar 17, 2016 · 50fabaa · 50fabaa
1 parent 779a556
commit 50fabaa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,16 +19,16 @@ Changelog
 * Prevent macros from seeing or affecting their calling scope. Merge of
   [#667](https://github.com/mozilla/nunjucks/pull/667).
 
-* Prevent filter.escape from escaping SafeString. Thanks atian25. Merge of
-  [#623](https://github.com/mozilla/nunjucks/pull/623).
-
 
 2.x (unreleased)
 ----------------
 
 * Don't double-escape. Thanks legutierr. Merge of
   [#701](https://github.com/mozilla/nunjucks/pull/701).
 
+* Prevent filter.escape from escaping SafeString. Thanks atian25. Merge of
+  [#623](https://github.com/mozilla/nunjucks/pull/623).
+
 * Throw an error if a block is defined multiple times. Refs
   [#696](https://github.com/mozilla/nunjucks/issues/696).