Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-22 23:24:48 -05:00
commit 6fe661f32a

View file

@ -48,6 +48,8 @@
return Response::json([
'id' => $track->id,
'title' => $track->title,
'description' => $track->description,
'lyrics' => $track->lyrics,
'user' => [
'id' => $track->user->id,
'name' => $track->user->display_name,