Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
BaseSqliteRepository.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00
CleanDatabaseScheduledTask.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00
ManagedConnection.cs	Fix some warnings	2020-02-23 12:11:43 +01:00
SqliteDisplayPreferencesRepository.cs	Migrate User DB to EF Core	2020-05-20 10:04:00 -04:00
SqliteExtensions.cs	Remove dead function	2020-04-15 14:29:12 +02:00
SqliteItemRepository.cs	Fix a small number of compile warnings	2020-06-09 23:12:53 +01:00
SqliteUserDataRepository.cs	2nd half of changes	2020-05-13 00:00:57 -04:00
TypeMapper.cs	Fix more warnings	2019-11-27 16:29:56 +01:00