Patrick Barron 3d69cea1c9 Merge branch 'master' into displaypreferences-efcore

2020-07-23 23:50:12 +00:00

..

Extensions

Document JSON options change

2020-04-15 17:02:43 -06:00

Migrations

Merge branch 'master' into displaypreferences-efcore

2020-07-23 23:50:12 +00: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

Merge branch 'master' into displaypreferences-efcore

2020-07-23 23:50:12 +00:00

Jellyfin.Server.csproj

Update .NET Core to 3.1.6

2020-07-17 19:48:11 -04:00

Program.cs

Update Jellyfin.Server/Program.cs

2020-07-23 12:03:46 +02:00

Startup.cs

Merge branch 'master' into websocket

2020-05-02 00:54:04 +02:00

StartupOptions.cs

Respect FFMpeg path passed via Environment Variable

2020-06-29 17:17:28 +01:00