fixed merge conflicts and merged master.

This commit is contained in:
Taylor Otwell 2011-09-03 09:14:27 -05:00
commit 86da3af7a1
2 changed files with 9 additions and 1 deletions

View File

@ -1,5 +1,13 @@
# 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.