Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs # Emby.Server.Implementations/ApplicationHost.cs # Emby.Server.Implementations/Devices/DeviceManager.cs # Jellyfin.Server/Jellyfin.Server.csproj # Jellyfin.Server/Migrations/MigrationRunner.cs # MediaBrowser.Controller/Devices/IDeviceManager.cs		2020-05-15 17:20:07 -04:00
..
Extensions	Document JSON options change	2020-04-15 17:02:43 -06:00
Migrations	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
Properties	Merge remote-tracking branch 'upstream/master' into development-https	2020-04-01 23:21:30 +02:00
Resources/Configuration	Increase min log level to 'Warning' framework namespaces	2020-03-03 00:36:54 +01:00
CoreAppHost.cs	Address review comments	2020-05-14 17:13:45 -04:00
Jellyfin.Server.csproj	Merge branch 'master' into userdb-efcore	2020-05-15 17:20:07 -04:00
Program.cs	Fix merge	2020-05-10 18:17:12 -04:00
Startup.cs	Merge branch 'master' into websocket	2020-05-02 00:54:04 +02:00
StartupOptions.cs	Add '--plugin-manifest-url' command line option and 'InstallationManager:PluginManifestUrl' config option	2020-04-05 13:46:36 -04:00