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

Merging from diverged develop

Browse Source
This commit is contained in:
James Barnsley
2018-04-23 08:13:24 +12:00
parent 40dd3dc124
commit 957acd204f
5 changed files with 20 additions and 5 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",
<<<<<<< Updated upstream
"version": "3.17.1",
=======
"version": "3.17.0",
>>>>>>> Stashed changes
"description": "Mopidy HTTP interface",
"repository": "https://github.com/jaedb/iris",
"author": "James Barnsley <james@barnsley.nz>",