Merge branch 'master' into prod

nicksloan · nicksloan · commit a2466be08e58 · 2011-03-10T11:17:50.000-05:00
diff --git a/cache/.gitignore b/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/index.php b/index.php
@@ -1,7 +1,7 @@
 <?php
 
-error_reporting(-1);
-ini_set('display_errors', 1);
+error_reporting(E_ALL);
+ini_set('display_errors', 0);
 
 $uri = $_SERVER['REQUEST_URI'];
 //echo "uri is: ".$uri."<br>";
