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

This commit is contained in:
Parker Moore
2014-06-24 23:04:53 -04:00
parent 20180923cf
commit c5aa74f823

View File

@@ -46,6 +46,7 @@
* Ignore *all* directories and files that merit it on auto-generation (#2459)
* Before copying file, explicitly remove the old one (#2535)
* Merge file system categories with categories from YAML. (#2531)
* Deep merge front matter defaults (#2490)
### Development Fixes