jellyfin/Jellyfin.Data
Patrick Barron 06f9cde22f Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
2020-06-04 16:52:23 -04:00
..
Entities Remove unused portions of the user schema 2020-05-30 22:11:53 -04:00
Enums Fix merge conflicts with SyncPlay 2020-05-26 20:52:05 -04:00
DayOfWeekHelper.cs Clean up DayOfWeekHelper.cs and remove unnecessary function 2020-05-30 20:02:55 -04:00
IHasPermissions.cs Expand and document IHasPermissions 2020-05-30 20:49:31 -04:00
ISavingChanges.cs Apply review suggestions 2020-05-10 10:54:41 -04:00
Jellyfin.Data.csproj Merge branch 'master' into userdb-efcore 2020-06-04 16:52:23 -04:00