From 4ccf9ea68350e4ee1a96513ff5fe6e8a4a8065bb Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 28 Nov 2014 21:27:32 -0800
Subject: [PATCH] Update history to reflect merge of #3162 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 16d7d7ea..2d68e4fc 100644
--- a/History.markdown
+++ b/History.markdown
@@ -15,6 +15,7 @@
 
   * Document the `-q` option for the `build` and `serve` commands (#3149)
   * Fix some minor typos/flow fixes in documentation website content (#3165)
+  * Add `keep_files` to configuration documentation (#3162)
 
 ## 2.5.2 / 2014-11-17