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-05-26 22:43:03 -04:00
2020-03-24 16:12:06 +01:00
2020-05-18 16:58:14 -05:00
2020-06-03 12:27:59 +03:00
2020-02-23 12:11:43 +01:00
2020-05-26 22:43:03 -04:00
2019-12-10 16:22:03 +01:00
2020-05-26 11:37:52 +02:00