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

2014-06-28 16:59:08 -04:00 · 2014-06-28 16:59:08 -04:00 · 8b36b71833
parent 7eb5e07e9d
commit 8b36b71833
1 changed files with 2 additions and 0 deletions
--- a/History.markdown
+++ b/History.markdown
@ -50,6 +50,8 @@
  * Merge file system categories with categories from YAML. (#2531)
  * Deep merge front matter defaults (#2490)
  * Ensure exclude and include arrays are arrays of strings (#2542)
+  * Allow collections to have dots in their filenames (#2552)
+  * Collections shouldn't try to read in directories as files (#2552)

 ### Development Fixes