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
..
2020-02-23 12:11:43 +01:00
2020-04-05 18:10:56 +02:00
2020-06-04 16:52:23 -04:00
2020-04-05 18:10:56 +02:00
2020-02-23 12:11:43 +01:00
2020-04-05 18:10:56 +02:00
2020-02-23 12:11:43 +01:00