You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		4 years ago
..
Configuration	…
Extensions	…
Filters	…
Formatters	…
Middleware	…
Migrations	…
Properties	…
Resources/Configuration	…
wwwroot/api-docs	…
CoreAppHost.cs	…
Jellyfin.Server.csproj	…
Program.cs	…
Startup.cs	…
StartupOptions.cs	…