fixed merge conflicts.
This commit is contained in:
commit
46dd65fa74
|
|
@ -1,5 +1,13 @@
|
||||||
# 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.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue