Merge branch 'master' into gh-pages

rondale-sc · Apr 23, 2012 · 2141bee · 2141bee
2 parents 52f877f + 0fadc73
commit 2141bee
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/jquery_pivot.js b/jquery_pivot.js
@@ -53,7 +53,7 @@ var methods = {
     };
   },
   process_from_url : function(options){
-    var re = /\.csv$/i,
+    var re = /\.json$/i,
         dataType;
 
     if (re.test(options.url))