jellyfin/MediaBrowser.Api/Images
Patrick Barron 06f9cde22f Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
2020-06-04 16:52:23 -04:00
..
ImageByNameService.cs * Add support for multi segment base urls 2019-11-25 11:55:24 +01:00
ImageRequest.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
ImageService.cs Merge branch 'master' into userdb-efcore 2020-06-04 16:52:23 -04:00
RemoteImageService.cs Merge branch 'master' into nullable3 2020-05-27 20:49:18 +02:00