fixed merge conflicts.

2011-09-08 17:57:27 -05:00 · 2011-09-08 17:57:27 -05:00 · f31bf1c8e4
parent abc1fad6c1 174d50c044
commit f31bf1c8e4
2 changed files with 9 additions and 1 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,13 @@
 # Laravel Change Log

+## Version 1.5.8
+
+- Fixed bug in form class that prevent name attributes from being set properly.
+
+### Upgrading from 1.5.7
+
+- Replace **system** directory.
+
 ## Version 1.5.7

 - Fixed bug that prevented view composers from being called for module named views.
--- a/public/index.php
+++ b/public/index.php
@ -45,4 +45,4 @@
 */
 require $laravel.'/laravel.php';

-echo (microtime(true) - START_TIME) * 1000;
+echo (microtime(true) - START_TIME) * 1000;