Develop #10

Merged
Dandellion merged 3 commits from develop into master 2018-10-21 20:30:52 +02:00

3 Commits

Author SHA1 Message Date
root 2a7174c96f Merge branch 'develop' of https://git.dodsorf.as/Dandellion/Radio-dodsorfas into develop 2018-10-21 18:08:01 +00:00
Joakim Pettersvold 8e1d7513a4 Merge branch 'master' into 'develop'
Added songs to playlists

See merge request Dandellion/Radio-dodsorfas!7
2018-10-21 18:05:52 +00:00
Joakim Pettersvold 1155d3d1d6 Added songs to playlists:
events/Halloween.m3u
normal/artists/AstridS.m3u
2018-10-21 20:01:23 +02:00