Merge remote-tracking branch 'origin' into ip-session-age

This commit is contained in:
Calvin Montgomery 2016-08-24 19:48:58 -07:00
commit af6e958c49
27 changed files with 6770 additions and 1420 deletions

View file

@ -675,7 +675,7 @@ PlaylistModule.prototype.handlePlayNext = function (user) {
title = this.current.media.title;
}
this.channel.logger.log("[playlist] " + user.getName() + " skipped" + title);
this.channel.logger.log("[playlist] " + user.getName() + " skipped " + title);
this._playNext();
};