fixing conflicts.

This commit is contained in:
Taylor Otwell
2012-04-04 09:57:08 -05:00
5 changed files with 23 additions and 3 deletions

View File

@@ -4,6 +4,8 @@
- [Laravel 3.2](#3.2)
- [Upgrading From 3.1](#upgrade-3.2)
- [Laravel 3.1.5](#3.1.5)
- [Upgrading From 3.1.4](#upgrade-3.1.5)
- [Laravel 3.1.4](#3.1.4)
- [Upgrading From 3.1.3](#upgrade-3.1.4)
- [Laravel 3.1.3](#3.1.3)
@@ -33,6 +35,16 @@
- Replace the **laravel** folder.
- Add new **vendors** folder.
<a name="3.1.5"></a>
## Laravel 3.1.5
- Fixes bug that could allow secure cookies to be sent over HTTP.
<a name="upgrade-3.1.5"></a>
## Upgrading From 3.1.4
- Replace the **laravel** folder.
<a name="3.1.4"></a>
## Laravel 3.1.4