Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge conflicts.

This commit is contained in:
Taylor Otwell 2011-09-08 17:57:27 -05:00
parent abc1fad6c1 174d50c044
commit f31bf1c8e4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changelog.md
View File

@ -1,5 +1,13 @@
# Laravel Change Log # 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 ## Version 1.5.7
- Fixed bug that prevented view composers from being called for module named views. - Fixed bug that prevented view composers from being called for module named views.

2
public/index.php
View File

@ -45,4 +45,4 @@
*/ */
require $laravel.'/laravel.php'; require $laravel.'/laravel.php';
echo (microtime(true) - START_TIME) * 1000; echo (microtime(true) - START_TIME) * 1000;