jellyfin/Jellyfin.Server
Patrick Barron c1360a1dc3 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Entities/User.cs
#	Jellyfin.Data/ISavingChanges.cs
#	Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
#	Jellyfin.Server.Implementations/JellyfinDb.cs
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Model/Notifications/NotificationOptions.cs
#	MediaBrowser.sln
2020-05-12 22:22:20 -04:00
..
Extensions Document JSON options change 2020-04-15 17:02:43 -06:00
Migrations Merge branch 'master' into userdb-efcore 2020-05-12 22:22:20 -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 Add back warning message when Skia encoder cannot be used 2020-04-17 10:25:49 -04:00
Jellyfin.Server.csproj Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Program.cs Merge pull request #2969 from BaronGreenback/my-feature 2020-05-07 02:24:42 +09:00
Startup.cs Address reviews 2020-04-27 08:42:46 -04:00
StartupOptions.cs Add '--plugin-manifest-url' command line option and 'InstallationManager:PluginManifestUrl' config option 2020-04-05 13:46:36 -04:00