secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merging from develop

Browse Source
This commit is contained in:
James Barnsley
2018-02-06 20:00:19 +13:00
parent 9205ee7cc7 4ef02f8287
commit 9223a42bf4
12 changed files with 506 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

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