From 388a37208e81fbe1eeda1750eebdc892e8c83949 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 25 Sep 2019 02:01:42 -0400
Subject: [PATCH] Update history to reflect merge of #7826 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 29ccf388..3782836f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -18,6 +18,7 @@
   * Clarify docs for static files in collection (#7812)
   * Rephrase the CircleCI v2 section (#7815)
   * Update old GitHub wiki URL with new one (#7823)
+  * Update JekyllConf page with 2019 talks (#7826)
 
 ## 4.0.0 / 2019-08-19