Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
sahat committed Feb 16, 2016
2 parents 2af5fb9 + b64dacd commit e91d703
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions examples/server/php/app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use Illuminate\Http\Request;
use Config;
use JWT;
use Firebase\JWT\JWT;
use App\User;

class UserController extends Controller {
Expand Down Expand Up @@ -45,4 +45,4 @@ public function updateUser(Request $request)

return response()->json(['token' => $token]);
}
}
}

0 comments on commit e91d703

Please sign in to comment.