Skip to content

S
syncEnrollments
Commit 86da3af7 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

fixed merge conflicts and merged master.

parents 0e6859fb fdc1c346
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 1 deletion
changelog.md
View file @ 86da3af7
# Laravel Change Log # Laravel Change Log
## Version 1.5.7
- Fixed bug that prevented view composers from being called for module named views.
### Upgrading from 1.5.6
- Replace **system** directory.
## Version 1.5.6 ## Version 1.5.6
- Fix bug that caused exceptions to not be shown when attempting to render a view that doesn't exist. - Fix bug that caused exceptions to not be shown when attempting to render a view that doesn't exist.
......
public/index.php
View file @ 86da3af7
...@@ -38,4 +38,4 @@ $public = __DIR__; ...@@ -38,4 +38,4 @@ $public = __DIR__;
*/ */
require $laravel.'/laravel.php'; require $laravel.'/laravel.php';
echo (microtime(true) - $t) * 1000; echo (microtime(true) - $t) * 1000;
\ 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