Merging from master

This commit is contained in:
James Barnsley
2018-11-29 14:59:05 +13:00
8 changed files with 2552 additions and 7 deletions

View File

@ -1 +1 @@
3.31.1
3.31.2

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -98,8 +98,13 @@
// Release details
// These are automatically injected to built HTML
<<<<<<< HEAD
var build = "1542915167";
var version = "3.31.1";
=======
var build = "1543175042";
var version = "3.31.2";
>>>>>>> master
// Construct the script tag
var js = document.createElement("script");

View File

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