From a762956000d16b2e445b8e0b1727059969514f69 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 23 Jun 2014 18:59:10 -0400 Subject: [PATCH] Update history to reflect merge of #2531 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 57eb6ad5..818ba7bd 100644 --- 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