Releasing 3.32.3

mopidy_iris/__init__.py

@@ -12,7 +12,7 @@ from handlers import WebsocketHandler, HttpHandler
 from core import IrisCore
 
 logger = logging.getLogger(__name__)
-__version__ = '3.32.2'
+__version__ = '3.32.3'
 
 ##
 # Core extension class

mopidy_iris/static/index.html

@@ -98,13 +98,8 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-<<<<<<< HEAD
-	var build = "1549415125";
-	var version = "3.32.1";
-=======
-	var build = "1549415262";
-	var version = "3.32.2";
->>>>>>> master
+	var build = "1549434521";
+	var version = "3.32.3";
 
 	// Construct the script tag
     var js = document.createElement("script");