Patrick Barron 45f478f63e Merge branch 'master' into authenticationdb-efcore ... # Conflicts: # Jellyfin.Server.Implementations/Security/AuthorizationContext.cs # MediaBrowser.Controller/Library/IUserManager.cs # MediaBrowser.Controller/Security/IAuthenticationRepository.cs # MediaBrowser.Controller/Session/ISessionManager.cs		2021-08-13 21:08:24 -04:00
..
AppBase
Archiving
Branding
Channels
Collections	EnsureLibraryFolder: Minor optimization	2021-07-26 23:25:21 +02:00
Configuration
Cryptography
Data
Devices
Dto
EntryPoints
HttpServer
Images
IO
Library
LiveTv
Localization	Merge remote-tracking branch 'upstream/master' into localization-test	2021-08-10 14:03:21 +02:00
MediaEncoder
Net
Playlists
Plugins
Properties
QuickConnect
ScheduledTasks	Merge branch 'master' into minor15	2021-08-13 00:33:18 +02:00
Serialization
Session
Sorting
SyncPlay
TV
Udp
Updates
ApplicationHost.cs	Merge branch 'master' into authenticationdb-efcore	2021-08-13 21:08:24 -04:00
ConfigurationOptions.cs
Emby.Server.Implementations.csproj	Invert code and style analysis configuration (#6334)	2021-07-30 09:49:28 +02:00
IStartupOptions.cs
ServerApplicationPaths.cs