Merge branch 'develop' of github.com:laravel/laravel into develop

32d4eeff · Taylor Otwell · 5a25b5a7 · d12f868f · 32d4eeff · 32d4eeff
Commit 32d4eeff authored Mar 01, 2012 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

error.php application/config/error.php +1 -1

artisan artisan +1 -1

paths.php paths.php +1 -1

index.php public/index.php +1 -1

No files found.
--- a/application/config/error.php
+++ b/application/config/error.php
@@ -13,7 +13,7 @@ return array(
 	|
 	*/
-	'ignore' => array(E_NOTICE, E_USER_NOTICE, E_DEPRECATED, E_USER_DEPRECATED),
+	'ignore' => array(),
 	/*
 	|--------------------------------------------------------------------------

--- a/artisan
+++ b/artisan
@@ -3,7 +3,7 @@
 * Laravel - A PHP Framework For Web Artisans
 *
 * @package  Laravel
- * @version  3.0.2
+ * @version  3.0.3
 * @author   Taylor Otwell <taylorotwell@gmail.com>
 * @link     http://laravel.com
 */

--- a/paths.php
+++ b/paths.php
@@ -3,7 +3,7 @@
 * Laravel - A PHP Framework For Web Artisans
 *
 * @package  Laravel
- * @version  3.0.2
+ * @version  3.0.3
 * @author   Taylor Otwell <taylorotwell@gmail.com>
 * @link     http://laravel.com
 */

--- a/public/index.php
+++ b/public/index.php
@@ -3,7 +3,7 @@
 * Laravel - A PHP Framework For Web Artisans
 *
 * @package  Laravel
- * @version  3.0.2
+ * @version  3.0.3
 * @author   Taylor Otwell <taylorotwell@gmail.com>
 * @link     http://laravel.com
 */