Merge conflict; Removing loader

This commit is contained in:
James Barnsley
2018-04-10 20:16:00 +12:00
4 changed files with 11 additions and 2 deletions

View File

@ -53265,6 +53265,7 @@ var PusherMiddleware = function () {
// Broadcast of an error
if (message.error !== undefined) {
store.dispatch(coreActions.handleException('Pusher: ' + message.error.message, message));
} else {
@ -53299,6 +53300,9 @@ var PusherMiddleware = function () {
case 'radio_stopped':
store.dispatch(pusherActions.radioStopped());
break;
case 'restart':
window.location.reload(true);
break;
}
}
}

File diff suppressed because one or more lines are too long

View File

@ -73,7 +73,7 @@
// Release details
// These are automatically injected to built HTML
var build = "1522870566";
var build = "1523263721";
var version = "3.16.1";
// Construct the script tag