Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-01 01:43:15 -05:00
commit bda0299e89

View file

@ -27,7 +27,7 @@ class CreateUserTables extends Migration {
$table->foreign('album_id')->references('id')->on('albums')->on_delete('cascade');; $table->foreign('album_id')->references('id')->on('albums')->on_delete('cascade');;
$table->foreign('playlist_id')->references('id')->on('playlists')->on_delete('cascade');; $table->foreign('playlist_id')->references('id')->on('playlists')->on_delete('cascade');;
$table->unique(['user_id', 'track_id', 'album_id', 'playlist_id', 'artist_id']); $table->unique(['user_id', 'track_id', 'album_id', 'playlist_id', 'artist_id'], 'resource_unique');
}); });
Schema::create('resource_log_items', function($table){ Schema::create('resource_log_items', function($table){