Merge branch '2.0-scrobble' into clean-2.0-scrobble
Conflicts resolved: nixtape/api/TrackXML.php
Showing
This diff is collapsed.
nixtape/scrobble-utils.php
0 → 100644
We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.
Conflicts resolved: nixtape/api/TrackXML.php