From bf3a20b2d71342540ccd3e31c487178502ce1305 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Fri, 9 May 2014 10:13:12 -0400
Subject: [PATCH] allow json files in _data dir

---
 lib/jekyll/site.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 288662a5..5f1580bb 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -198,7 +198,7 @@ module Jekyll
       base = File.join(source, dir)
       return unless File.directory?(base) && (!safe || !File.symlink?(base))
 
-      entries = Dir.chdir(base) { Dir['*.{yaml,yml}'] }
+      entries = Dir.chdir(base) { Dir['*.{yaml,yml,json}'] }
       entries.delete_if { |e| File.directory?(File.join(base, e)) }
 
       entries.each do |entry|