Post-merge buildout
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
4
mopidy_iris/static/app.min.js
vendored
4
mopidy_iris/static/app.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -98,13 +98,8 @@
|
||||
|
||||
// Release details
|
||||
// These are automatically injected to built HTML
|
||||
<<<<<<< HEAD
|
||||
var build = "1548618298";
|
||||
var version = "3.31.8";
|
||||
=======
|
||||
var build = "1548618739";
|
||||
var build = "1548619062";
|
||||
var version = "3.32.0";
|
||||
>>>>>>> master
|
||||
|
||||
// Construct the script tag
|
||||
var js = document.createElement("script");
|
||||
|
||||
Reference in New Issue
Block a user