fixed merge conflicts and merged master.

2011-09-03 09:14:27 -05:00
parent 0e6859fb45 fdc1c34676
commit 86da3af7a1
2 changed files with 9 additions and 1 deletions
--- a/public/index.php
+++ b/public/index.php
@@ -38,4 +38,4 @@ $public      = __DIR__;
 */
 require $laravel.'/laravel.php';

-echo (microtime(true) - $t) * 1000;
+echo (microtime(true) - $t) * 1000;