Skip to content

Commit

Permalink
Merge branch 'master' into release-2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jodal committed Jun 9, 2019
2 parents d928f3d + fb77f0c commit 3ab6b55
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
Binary file added docs/clients/mpd-client-cantata.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions docs/clients/mpd.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ Mopidy.
MPD graphical clients
=====================

Cantata
-------

`Cantata <https://github.com/CDrummond/cantata>`_ is a graphical MPD client
with support for Linux, mac OS, and Windows.

.. image:: mpd-client-cantata.png
:width: 1232
:height: 710

GMPC
----

Expand Down

0 comments on commit 3ab6b55

Please sign in to comment.