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-08-25 23:02:12 -05:00
parent 1e7850d9ba c1131e1882
commit 46dd65fa74
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.6.6
- Fix bug that caused exceptions to not be shown when attempting to render a view that doesn't exist.
### Upgrading from 1.5.5
- Replace **system** directory.
## Version 1.5.5 ## Version 1.5.5
- Fix bug in session class cookie option extraction. - Fix bug in session class cookie option extraction.

2
public/index.php
View File

@ -36,4 +36,4 @@
| 3... 2... 1... Lift-off! | 3... 2... 1... Lift-off!
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
require $laravel.'/laravel.php'; require $laravel.'/laravel.php';