Patrick Barron 7a115024aa Merge branch 'master' into userdb-efcore ... # Conflicts: # MediaBrowser.Controller/Library/ILibraryManager.cs # MediaBrowser.Providers/Users/UserMetadataService.cs		2020-06-11 18:23:12 -04:00
..
Audio.cs	Make SonarCloud less angry	2020-05-26 22:43:03 -04:00
IHasAlbumArtist.cs	More warning fixes	2019-08-29 22:28:33 +02:00
IHasMusicGenres.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	2019-01-13 21:01:16 +01:00
MusicAlbum.cs	Merge branch 'master' into userdb-efcore	2020-06-11 18:23:12 -04:00
MusicArtist.cs	Merge branch 'master' into userdb-efcore	2020-06-11 18:23:12 -04:00
MusicGenre.cs	Fix Json serialization error	2019-10-15 17:49:49 +02:00