Merge branch 'master' of https://github.com/maxerenberg/Iris into maxerenberg-master
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
92
mopidy_iris/static/app.min.js
vendored
92
mopidy_iris/static/app.min.js
vendored
File diff suppressed because one or more lines are too long
148814
mopidy_iris/static/app_BACKUP_19589.js
Normal file
148814
mopidy_iris/static/app_BACKUP_19589.js
Normal file
File diff suppressed because one or more lines are too long
129015
mopidy_iris/static/app_BASE_19589.js
Normal file
129015
mopidy_iris/static/app_BASE_19589.js
Normal file
File diff suppressed because one or more lines are too long
148206
mopidy_iris/static/app_LOCAL_19589.js
Normal file
148206
mopidy_iris/static/app_LOCAL_19589.js
Normal file
File diff suppressed because one or more lines are too long
129024
mopidy_iris/static/app_REMOTE_19589.js
Normal file
129024
mopidy_iris/static/app_REMOTE_19589.js
Normal file
File diff suppressed because one or more lines are too long
@ -106,8 +106,13 @@
|
||||
|
||||
// Release details
|
||||
// These are automatically injected to built HTML
|
||||
<<<<<<< HEAD
|
||||
var build = "1605340269";
|
||||
var version = "3.54.1";
|
||||
=======
|
||||
var build = "1598940390";
|
||||
var version = "3.52.4";
|
||||
>>>>>>> c7462e44a9fa9a2d85a1e529f43f43d7edd97d83
|
||||
|
||||
// Construct the script tag
|
||||
var js = document.createElement("script");
|
||||
|
||||
Reference in New Issue
Block a user