Skip to content

S
syncEnrollments
Commit 46dd65fa authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

fixed merge conflicts.

parents 1e7850d9 c1131e18
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 1 deletion
changelog.md
View file @ 46dd65fa
# 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.
......
public/index.php
View file @ 46dd65fa
...@@ -36,4 +36,4 @@ $public = __DIR__; ...@@ -36,4 +36,4 @@ $public = __DIR__;
| 3... 2... 1... Lift-off! | 3... 2... 1... Lift-off!
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
require $laravel.'/laravel.php'; require $laravel.'/laravel.php';
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment