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

This commit is contained in:
Parker Moore 2014-05-21 01:09:27 -04:00
parent 3c6377d665
commit 581f34dced
1 changed files with 1 additions and 0 deletions

View File

@ -9,6 +9,7 @@
* 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) * Use `_config.yaml` or `_config.yml` (`.yml` takes precedence) (#2406)
* Override collection url template (#2418) * Override collection url template (#2418)
* Allow subdirectories in `_data` (#2395)
### Bug Fixes ### Bug Fixes