fix conflicts.

This commit is contained in:
Taylor Otwell
2012-04-05 09:33:50 -05:00
5 changed files with 48 additions and 15 deletions

View File

@@ -4,6 +4,8 @@
- [Laravel 3.2](#3.2)
- [Upgrading From 3.1](#upgrade-3.2)
- [Laravel 3.1.6](#3.1.6)
- [Upgrading From 3.1.5](#upgrade-3.1.6)
- [Laravel 3.1.5](#3.1.5)
- [Upgrading From 3.1.4](#upgrade-3.1.5)
- [Laravel 3.1.4](#3.1.4)
@@ -37,6 +39,16 @@
- Replace the **laravel** folder.
<a name="3.1.6"></a>
## Laravel 3.1.6
- Fixes many-to-many eager loading in Eloquent.
<a name="upgrade-3.1.6"></a>
## Upgrading From 3.1.5
- Replace the **laravel** folder.
<a name="3.1.5"></a>
## Laravel 3.1.5