From 897cdbb4276ae931e87f9198eb3e050209408921 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Tue, 25 Jul 2017 18:22:41 -0400
Subject: [PATCH] Update history to reflect merge of #6231 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 22566692..0dc2ac15 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
 
   * Ignore final newline in folded YAML string (#6054)
   * Add URL checks to Doctor (#5760)
+  * Fix serving files that clash with directories (#6222) (#6231)
 
 ### Bug Fixes