Patrick Barron b6446c06ee Merge branch 'master' into authenticationdb-efcore ... # Conflicts: # Emby.Server.Implementations/Security/AuthenticationRepository.cs # Jellyfin.Server.Implementations/Security/AuthorizationContext.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs		2021-05-21 00:19:07 -04:00
..
AudioHelper.cs	EncodingHelper: Fix circular dependency	2021-04-20 23:03:36 +02:00
ClaimHelpers.cs	Use proper IsApiKey flag	2020-10-28 08:40:11 -06:00
ClassMigrationHelper.cs	changes	2020-11-21 16:14:03 +00:00
DynamicHlsHelper.cs	EncodingHelper: Fix circular dependency	2021-04-20 23:03:36 +02:00
FileStreamResponseHelpers.cs	Update Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs	2021-03-24 22:46:08 +01:00
HlsCodecStringHelpers.cs	Merge remote-tracking branch 'upstream/master' into fmp4-hls	2020-11-16 12:36:55 +08:00
HlsHelpers.cs	Use new ReadAllLines extensions	2021-05-06 14:12:43 +02:00
MediaInfoHelper.cs	Migrate authentication db to EF Core	2021-05-20 23:56:59 -04:00
ProgressiveFileCopier.cs	prevent cancellationtoken leakage	2021-04-30 15:27:07 +02:00
ProgressiveFileStream.cs	Apply patch	2020-11-03 16:38:47 -07:00
RequestHelpers.cs	Migrate authentication db to EF Core	2021-05-20 23:56:59 -04:00
StreamingHelpers.cs	Migrate authentication db to EF Core	2021-05-20 23:56:59 -04:00
TranscodingJobHelper.cs	Merge branch 'master' into authenticationdb-efcore	2021-05-21 00:19:07 -04:00