From 1987c36f27a49f21489950ae327a366762cbfb27 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 19 Sep 2018 07:56:17 -0400
Subject: [PATCH] Update history to reflect merge of #7229 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8c292a42..60bfdfe6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -111,6 +111,7 @@
   * Add call to unused method `validate_options` in `commands/serve.rb` (#7122)
   * Security: fix `include` bypass of `EntryFilter#filter` symlink check (#7226)
   * 3.8.x: security: fix `include` bypass of `EntryFilter#filter` symlink check (#7228)
+  * 3.6.x: security: fix `include` bypass of `EntryFilter#filter` symlink check (#7229)
 
 ### feature