Merge master into develop

This commit is contained in:
Stein Magnus Jodal 2013-12-10 09:34:21 +01:00
commit 1bdc941b9c

View File

@ -29,7 +29,7 @@ config value, you **should not** add it to
:file:`~/.config/mopidy/mopidy.conf`. :file:`~/.config/mopidy/mopidy.conf`.
To see what's the effective configuration for your Mopidy installation, you can To see what's the effective configuration for your Mopidy installation, you can
run :option:`mopidy --show-config`. It will print your full effective config run :option:`mopidy config`. It will print your full effective config
with passwords masked out so that you safely can share the output with others with passwords masked out so that you safely can share the output with others
for debugging. for debugging.