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
..
AiredEpisodeOrderComparer.cs
AlbumArtistComparer.cs
AlbumComparer.cs
ArtistComparer.cs
CommunityRatingComparer.cs
CriticRatingComparer.cs
DateCreatedComparer.cs
DateLastMediaAddedComparer.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
DatePlayedComparer.cs
IsFavoriteOrLikeComparer.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
IsFolderComparer.cs
IsPlayedComparer.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
IsUnplayedComparer.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
NameComparer.cs
OfficialRatingComparer.cs
PlayCountComparer.cs
PremiereDateComparer.cs
ProductionYearComparer.cs
RandomComparer.cs
RuntimeComparer.cs
SeriesSortNameComparer.cs
SortNameComparer.cs
StartDateComparer.cs
StudioComparer.cs