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

2015-10-29 09:59:38 -05:00
parent 58bc5273b8 892ab27f8d
commit 4b1322e9a0
2 changed files with 7 additions and 6 deletions
--- a/app/User.php
+++ b/app/User.php
@@ -10,9 +10,10 @@ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;

-class User extends Model implements AuthenticatableContract,
-                                    AuthorizableContract,
-                                    CanResetPasswordContract
+class User extends Model implements
+    AuthenticatableContract,
+    AuthorizableContract,
+    CanResetPasswordContract
 {
    use Authenticatable, Authorizable, CanResetPassword;