fixed merge conflicts.

2011-08-25 23:02:12 -05:00 · 2011-08-25 23:02:12 -05:00 · 46dd65fa74
parent 1e7850d9ba c1131e1882
commit 46dd65fa74
2 changed files with 9 additions and 1 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,13 @@
 # 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.