Skip to content

S
syncEnrollments
Commit e16ab6f3 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

fixing conflicts.

parents 2b88c788 728a320c
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 3 deletions
artisan
View file @ e16ab6f3
......@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans
*
* @package Laravel
* @version 3.1.7
* @version 3.1.8
* @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com
*/
......
laravel/documentation/changes.md
View file @ e16ab6f3
......@@ -4,6 +4,8 @@
- [Laravel 3.2](#3.2)
- [Upgrading From 3.1](#upgrade-3.2)
- [Laravel 3.1.8](#3.1.8)
- [Upgrading From 3.1.7](#upgrade-3.1.8)
- [Laravel 3.1.7](#3.1.7)
- [Upgrading From 3.1.6](#upgrade-3.1.7)
- [Laravel 3.1.6](#3.1.6)
......@@ -48,6 +50,16 @@
- Replace the **laravel** folder.
<a name="3.1.8"></a>
## Laravel 3.1.8
- Fixes possible WSOD when using Blade's @include expression.
<a name="upgrade-3.1.8"></a>
## Upgrading From 3.1.7
- Replace the **laravel** folder.
<a name="3.1.7"></a>
## Laravel 3.1.7
......
paths.php
View file @ e16ab6f3
......@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans
*
* @package Laravel
* @version 3.1.7
* @version 3.1.8
* @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com
*/
......
public/index.php
View file @ e16ab6f3
......@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans
*
* @package Laravel
* @version 3.1.7
* @version 3.1.8
* @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment