Merging from PR #588, fixes #627 and #582

2020-11-14 22:19:48 +13:00
parent e0e9c70769
commit b614b4a5a4
12 changed files with 212 additions and 555839 deletions
--- a/mopidy_iris/static/app.js
+++ b/mopidy_iris/static/app.js
--- a/mopidy_iris/static/app.js.map
+++ b/mopidy_iris/static/app.js.map
--- a/mopidy_iris/static/app.min.js
+++ b/mopidy_iris/static/app.min.js
--- a/mopidy_iris/static/app_BACKUP_19589.js
+++ b/mopidy_iris/static/app_BACKUP_19589.js
--- a/mopidy_iris/static/app_BASE_19589.js
+++ b/mopidy_iris/static/app_BASE_19589.js
--- a/mopidy_iris/static/app_LOCAL_19589.js
+++ b/mopidy_iris/static/app_LOCAL_19589.js
--- a/mopidy_iris/static/app_REMOTE_19589.js
+++ b/mopidy_iris/static/app_REMOTE_19589.js
--- a/mopidy_iris/static/index.html
+++ b/mopidy_iris/static/index.html
@ -106,13 +106,8 @@

 	// Release details
 	// These are automatically injected to built HTML
-<<<<<<< HEAD
-	var build = "1605340269";
+	var build = "1605345483";
 	var version = "3.54.1";
-=======
-	var build = "1598940390";
-	var version = "3.52.4";
->>>>>>> c7462e44a9fa9a2d85a1e529f43f43d7edd97d83

 	// Construct the script tag
 	var js = document.createElement("script");