Update history to reflect merge of #1114

This commit is contained in:
Matt Rogers 2013-05-17 22:46:11 -05:00
parent 9614d516f0
commit 6a7ed52b37
1 changed files with 2 additions and 0 deletions

View File

@ -8,6 +8,8 @@
### Bug Fixes ### Bug Fixes
* Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106) * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
* Exit with a non-zero exit code when dealing with a Liquid error (#1121) * Exit with a non-zero exit code when dealing with a Liquid error (#1121)
* Make the `exclude` and `include` options backwards compatible with
versions of Jekyll prior to 1.0 (#1114)
### Site Enhancements ### Site Enhancements
* Add link to jekyll-minibundle in the doc's plugins list (#1035) * Add link to jekyll-minibundle in the doc's plugins list (#1035)