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

fix conflicts.

Browse Source
This commit is contained in:
Taylor Otwell
2012-03-29 22:11:30 -05:00
parent 7c9228b40b b870ac09dd
commit 062ae8756c
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
changes.md
View File

@@ -4,6 +4,8 @@
- [Laravel 3.2](#3.2)
- [Upgrading From 3.1](#upgrade-3.2)
- [Laravel 3.1.2](#3.1.2)
- [Upgrading From 3.1.1](#upgrade-3.1.2)
- [Laravel 3.1.1](#3.1.1)
- [Upgrading From 3.1](#upgrade-3.1.1)
- [Laravel 3.1](#3.1)
@@ -21,6 +23,17 @@
<a name="upgrade-3.2"></a>
## Upgrading From 3.1
- Replace the **laravel** folder.
- Add new **vendors** folder.
<a name="3.1.2"></a>
## Laravel 3.1.2
- Fixes Eloquent query method constructor conflict.
<a name="upgrade-3.1.2"></a>
## Upgrade From 3.1.1
- Replace the **laravel** folder.
<a name="3.1.1"></a>