Buildout 3.54.1

IRIS_VERSION

@@ -1 +1 @@
-3.54.0
+3.54.1

mopidy_iris/__init__.py

@@ -3,7 +3,7 @@ import pathlib
 
 from mopidy import config, ext
 
-__version__ = "3.54.0"
+__version__ = "3.54.1"
 
 logger = logging.getLogger(__name__)
 

mopidy_iris/static/index.html

@@ -106,12 +106,8 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-<<<<<<< HEAD
-	var build = "1605168574";
-=======
-	var build = "1605167537";
->>>>>>> develop
-	var version = "3.54.0";
+	var build = "1605168871";
+	var version = "3.54.1";
 
 	// Construct the script tag
 	var js = document.createElement("script");

mopidy_iris/static/manifest.json

@@ -1,5 +1,5 @@
 {
-  "manifest_version": "3.54.0",
+  "manifest_version": "3.54.1",
   "short_name": "Iris",
   "name": "Iris",
   "icons": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mopidy-iris",
-  "version": "3.54.0",
+  "version": "3.54.1",
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <james@barnsley.nz>",

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Mopidy-Iris
-version = 3.54.0
+version = 3.54.1
 url = https://github.com/jaedb/iris
 author = James Barnsley
 author_email = james@barnsley.nz