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
..
ImageByNameService.cs	* Add support for multi segment base urls	2019-11-25 11:55:24 +01:00
ImageRequest.cs	Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller	2019-01-13 21:01:16 +01:00
ImageService.cs	Initial migration code	2020-05-12 22:10:35 -04:00
RemoteImageService.cs	Minor IAsyncDisposable improvements	2020-04-15 11:05:32 +02:00