Merge branch 'master' into release-1.1

This commit is contained in:
Stein Magnus Jodal 2015-10-06 11:46:15 +02:00
commit b020d12885
3 changed files with 15 additions and 1 deletions

View File

@ -111,7 +111,7 @@ To start the music server, run::
mopidy
To start the server with an additional config file than can override configs
To start the server with an additional config file, that can override configs
set in the default config files, run::
mopidy --config ./my-config.conf

BIN
docs/ext/mopidy_party.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

View File

@ -133,6 +133,20 @@ To install, run::
pip install Mopidy-MusicBox-Webclient
Mopidy-Party
============
https://github.com/Lesterpig/mopidy-party
Minimal web client designed for collaborative music management during parties.
.. image:: /ext/mopidy_party.png
To install, run::
pip install Mopidy-Party
Mopidy-Simple-Webclient
=======================