diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-11-17 10:46:57 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-11-17 10:46:57 -0500 |
| commit | 7bb0e4dad34fe71264dfac4b9778544e3f5c64fc (patch) | |
| tree | 382f5be35b350ac74debfaf1e97aaf73a5f92086 | |
| parent | 1a30e93961def546c8c75fa020fceb2ef6ea7b4d (diff) | |
| download | mako-7bb0e4dad34fe71264dfac4b9778544e3f5c64fc.tar.gz | |
cherry-pick changelog from 1.1.6
| -rw-r--r-- | doc/build/changelog.rst | 14 | ||||
| -rw-r--r-- | doc/build/unreleased/346.rst | 9 |
2 files changed, 14 insertions, 9 deletions
diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst index 31ef5b1..debc92d 100644 --- a/doc/build/changelog.rst +++ b/doc/build/changelog.rst @@ -10,9 +10,23 @@ Changelog :version: 1.2 :include_notes_from: unreleased + 1.1 === +.. changelog:: + :version: 1.1.6 + :released: Wed Nov 17 2021 + + .. change:: + :tags: bug, lexer + :tickets: 346 + :versions: 1.2.0, 1.1.6 + + Fixed issue where control statements on multi lines with a backslash would + not parse correctly if the template itself contained CR/LF pairs as on + Windows. Pull request courtesy Charles Pigott. + .. changelog:: :version: 1.1.5 diff --git a/doc/build/unreleased/346.rst b/doc/build/unreleased/346.rst deleted file mode 100644 index 329116c..0000000 --- a/doc/build/unreleased/346.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. change:: - :tags: bug, lexer - :tickets: 346 - :versions: 1.2.0, 1.1.6 - - Fixed issue where control statements on multi lines with a backslash would - not parse correctly if the template itself contained CR/LF pairs as on - Windows. Pull request courtesy Charles Pigott. - |