fixed merge conflicts.

46dd65fa · Taylor Otwell · 1e7850d9 · c1131e18 · 46dd65fa · 46dd65fa
Commit 46dd65fa authored Aug 26, 2011 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

changelog.md changelog.md +8 -0

index.php public/index.php +1 -1

No files found.
--- a/changelog.md
+++ b/changelog.md
 # 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

 - Fix bug in session class cookie option extraction.

--- a/public/index.php
+++ b/public/index.php
@@ -36,4 +36,4 @@ $public      = __DIR__;
 | 3... 2... 1... Lift-off!
 |--------------------------------------------------------------------------
 */
-require $laravel.'/laravel.php';
\ No newline at end of file
+require $laravel.'/laravel.php';