From b353e181c1ad7fb51a70829725e964c156f7e0c0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 25 May 2016 16:05:31 -0700
Subject: [PATCH] Update history to reflect merge of #4945

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 4d6f779b..95262dca 100644
--- a/History.markdown
+++ b/History.markdown
@@ -49,6 +49,7 @@
   * From v3.1.4: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942)
   * From v3.1.4: Fix `{{ layout }}` oddities (proper inheritance & fixing overflow of old data) (#4943)
   * From v3.1.5: Sort the results of the `require_all` glob (#4944)
+  * From v3.1.6: Add ability to render drops as JSON (#4945)
 
 ### Development Fixes