Update history to reflect merge of #2406 [ci skip]

This commit is contained in:
Parker Moore 2014-05-20 00:16:58 -04:00
parent 54fba9af4b
commit a07f690509
1 changed files with 1 additions and 0 deletions

View File

@ -7,6 +7,7 @@
* Add support for JSON files in the `_data` directory (#2369) * Add support for JSON files in the `_data` directory (#2369)
* Allow subclasses to override `EXCERPT_ATTRIBUTES_FOR_LIQUID` (#2408) * Allow subclasses to override `EXCERPT_ATTRIBUTES_FOR_LIQUID` (#2408)
* Add `Jekyll.env` and `jekyll.environment` (the Liquid var) (#2417) * Add `Jekyll.env` and `jekyll.environment` (the Liquid var) (#2417)
* Use `_config.yaml` or `_config.yml` (`.yml` takes precedence) (#2406)
### Bug Fixes ### Bug Fixes