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

2016-01-15 15:06:56 -08:00 · 2016-01-15 15:06:56 -08:00 · 04e1768807
parent 0587a3bb57
commit 04e1768807
1 changed files with 1 additions and 0 deletions
--- a/History.markdown
+++ b/History.markdown
@ -36,6 +36,7 @@
  * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290)
  * Escape html from site.title and page.title in site template (#4307)
  * Allow custom file extensions if defined in `permalink` YAML front matter (#4314)
+  * Fix deep_merge_hashes! handling of drops and hashes (#4359)

 ### Development Fixes