Merge branch 'master' into develop

2012-02-29 20:39:23 -06:00
parent 871d205a35 e36dba4f10
commit d12f868f8c
4 changed files with 4 additions and 4 deletions
--- 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/2
+++ b/2
@@ -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
 */