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

2014-06-23 18:59:10 -04:00 · 2014-06-23 18:59:10 -04:00 · a762956000
parent e58c1ee306
commit a762956000
1 changed files with 1 additions and 0 deletions
--- a/History.markdown
+++ b/History.markdown
@ -40,6 +40,7 @@
    error which stated that redcarpet was missing, not rouge. (#2464)
  * 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)

 ### Development Fixes