Update history to reflect merge of #1118

This commit is contained in:
Matt Rogers 2013-07-01 09:53:34 -05:00
parent 2484833bc8
commit 7e750f3230
1 changed files with 2 additions and 0 deletions

View File

@ -9,6 +9,8 @@
sites (#1245, #1247) sites (#1245, #1247)
* Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new * Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new
sites. (#1247) sites. (#1247)
* In the generated site, remove files that will be replaced by a
directory (#1118)
### Bug Fixes ### Bug Fixes
* Fix pagination in subdirectories. (#1198) * Fix pagination in subdirectories. (#1198)