Merge remote-tracking branch 'refs/remotes/Jiiks/master'

This commit is contained in:
sakuzyo 2015-12-02 01:30:14 +01:00
commit 792e62fbc0
1 changed files with 2 additions and 2 deletions

View File

@ -239,7 +239,7 @@ BetterDiscord.prototype.ipcAsyncMessage = function(event, arg) {
'resource': 'Main CSS', 'resource': 'Main CSS',
'domain': _updater.CDN, 'domain': _updater.CDN,
'url': '//' + _updater.CDN + '/' + _repo + '/BetterDiscordApp/' + _hash + '/css/main.min.css', 'url': '//' + _updater.CDN + '/' + _repo + '/BetterDiscordApp/' + _hash + '/css/main.min.css',
'localurl': '', 'localurl': _localServer + '/BetterDiscord/css/main.css',
'message': 'load-mainJS', 'message': 'load-mainJS',
'cacheable': false, 'cacheable': false,
'variable': null 'variable': null
@ -249,7 +249,7 @@ BetterDiscord.prototype.ipcAsyncMessage = function(event, arg) {
'resource': 'Main JS', 'resource': 'Main JS',
'domain': _updater.CDN, 'domain': _updater.CDN,
'url': '//' + _updater.CDN + '/' + _repo + '/BetterDiscordApp/' + _hash + '/js/main.min.js', 'url': '//' + _updater.CDN + '/' + _repo + '/BetterDiscordApp/' + _hash + '/js/main.min.js',
'localurl': '', 'localurl': _localServer + '/BetterDiscord/js/main.js',
'message': 'load-publicServers', 'message': 'load-publicServers',
'cacheable': false, 'cacheable': false,
'variable': null 'variable': null