Skip to content

Commit

Permalink
Update changelog.
Browse files Browse the repository at this point in the history
  • Loading branch information
carljm committed Nov 19, 2015
1 parent b7bdd7a commit a38b8c3
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ Changelog
master (unreleased)
-------------------

* Allows compiled templates to be imported, included and extended. Thanks
Luis Gutierrez-Sheris. Merge of [#581](https://github.com/mozilla/nunjucks/pull/581).
* Add `striptags` filter. Thanks Anthony Giniers. Merge of
[#589](https://github.com/mozilla/nunjucks/pull/589).
* Allow compiled templates to be imported, included and extended. Thanks Luis
Gutierrez-Sheris. Merge of
[#581](https://github.com/mozilla/nunjucks/pull/581).
* Fix issue with different nunjucks environments sharing same globals. Each
environment is now independent. Thanks Paul Pechin. Merge of
[#574](https://github.com/mozilla/nunjucks/pull/574).
Expand Down

0 comments on commit a38b8c3

Please sign in to comment.