Merge branch 'devel'

This commit is contained in:
BrokenFire 2018-01-12 13:05:27 +01:00
commit 48b96c2c55

View File

@ -25,8 +25,8 @@ import java.util.List;
@RequestMapping("/api/music/") @RequestMapping("/api/music/")
public class MusicWebAPIController { public class MusicWebAPIController {
Logger logger = LogManager.getLogger(); Logger logger = LogManager.getLogger();
@Autowired // @Autowired
public SavedPlaylistRepository savedPlaylist; // public SavedPlaylistRepository savedPlaylist;
@RequestMapping("/currentMusicInfo") @RequestMapping("/currentMusicInfo")
public CurrentMusicData getCurrentM(){ public CurrentMusicData getCurrentM(){