Skip to content

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

Merge remote-tracking branch 'origin/master' into develop

parents 46595ce5 89dc8903
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
artisan
View file @ b549e30c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans
* *
* @package Laravel * @package Laravel
* @version 3.0.3 * @version 3.0.4
* @author Taylor Otwell <taylorotwell@gmail.com> * @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com * @link http://laravel.com
*/ */
......
laravel/ioc.php
View file @ b549e30c
...@@ -130,7 +130,7 @@ class IoC { ...@@ -130,7 +130,7 @@ class IoC {
// If the resolver is registering as a singleton resolver, we will cache // If the resolver is registering as a singleton resolver, we will cache
// the instance of the object in the container so we can resolve it next // the instance of the object in the container so we can resolve it next
// time without having to instantiate a brand new instance. // time without having to instantiate a brand new instance.
if (isset(static::$registry[$name]['singleton'])) if (static::$registry[$name]['singleton'])
{ {
return static::$singletons[$name] = $object; return static::$singletons[$name] = $object;
} }
......
paths.php
View file @ b549e30c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans
* *
* @package Laravel * @package Laravel
* @version 3.0.3 * @version 3.0.4
* @author Taylor Otwell <taylorotwell@gmail.com> * @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.com * @link http://laravel.com
*/ */
......
public/index.php
View file @ b549e30c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans
* *
* @package Laravel * @package Laravel
* @version 3.0.3 * @version 3.0.4
* @author Taylor Otwell <taylorotwell@gmail.com> * @author Taylor Otwell <taylorotwell@gmail.com>
* @link http://laravel.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