Merge branch 'master' into 0.9.x

tuupola · Dec 18, 2013 · 08a8d6b · 08a8d6b
2 parents b672e12 + bf34e34
commit 08a8d6b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/json.php b/json.php
@@ -2,6 +2,8 @@
 
 /* This is just a dummy file for generating example JSON. */
 
+header("Access-Control-Allow-Origin: *");
+
 $response[""] = "--";
 
 if (isset($_GET["series"]) && isset($_GET["model"])) {
@@ -181,4 +183,4 @@
     };
 }
 
-print json_encode($response);
+print json_encode($response);