jellyfin-server/MediaBrowser.Providers
Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00
..
Books Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
BoxSets Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Channels Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Chapters Address comments 2020-04-01 19:05:41 +02:00
Folders Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Genres Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
LiveTv Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Manager Merge branch 'master' into userdb-efcore 2020-06-13 19:41:05 -04:00
MediaInfo Merge pull request #3254 from crobibero/ilogger 2020-06-13 00:29:43 +09:00
Movies Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Music Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
MusicGenres Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
People Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Photos Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Playlists Merge pull request #3254 from crobibero/ilogger 2020-06-13 00:29:43 +09:00
Plugins Merge pull request #3254 from crobibero/ilogger 2020-06-13 00:29:43 +09:00
Properties Adjusted AssemblyCopyright attribute values. 2019-03-14 22:17:56 +01:00
Studios Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Subtitles Use typed logger where possible 2020-06-05 18:15:56 -06:00
TV Merge pull request #3254 from crobibero/ilogger 2020-06-13 00:29:43 +09:00
Videos Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
Years Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
MediaBrowser.Providers.csproj Update to .NET Core 3.1.5 2020-06-11 07:13:56 -06:00