ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing conflicts.

Browse Source
This commit is contained in:
Taylor Otwell
2012-04-24 10:42:57 -05:00
parent a994c30ab3 8e05530869
commit 68834a47d9
6 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
laravel/documentation/changes.md
View File

@@ -2,8 +2,13 @@
## Contents
<<<<<<< HEAD:laravel/documentation/changes.md
- [Laravel 3.2](#3.2)
- [Upgrading From 3.1](#upgrade-3.2)
=======
- [Laravel 3.1.9](#3.1.9)
- [Upgrading From 3.1.8](#upgrade-3.1.9)
>>>>>>> master:changes.md
- [Laravel 3.1.8](#3.1.8)
- [Upgrading From 3.1.7](#upgrade-3.1.8)
- [Laravel 3.1.7](#3.1.7)
@@ -62,6 +67,16 @@
- Replace the **laravel** folder.
<a name="3.1.9"></a>
## Laravel 3.1.9
- Fixes cookie session driver bug that caused infinite loop on some occasions.
<a name="upgrade-3.1.9"></a>
## Upgrading From 3.1.8
- Replace the **laravel** folder.
<a name="3.1.8"></a>
## Laravel 3.1.8