andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix changelog merge conflict.

Browse Source
This commit is contained in:
jcass 2016-01-02 15:56:04 +02:00
parent f2194e9d5e
commit aa140beda4
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changelog.rst
View File

@ -31,12 +31,6 @@ Bug fix release.
- MPD: Don't return tracks with empty URIs. (Partly fixes: :issue:`1340`, PR: - MPD: Don't return tracks with empty URIs. (Partly fixes: :issue:`1340`, PR:
:issue:`1343`) :issue:`1343`)
- Main: Catch errors when loading :confval:`logging/config_file`. (Fixes:
:issue:`1320`)
- MPD: Don't return tracks with empty URIs. (Partly fixes: :issue:`1340`, PR:
:issue:`1343`)
v1.1.1 (2015-09-14) v1.1.1 (2015-09-14)
=================== ===================