fixing conflicts.

artisan

@@ -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

@@ -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

@@ -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

@@ -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
  */