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-03-11 20:26:43 +01:00
2020-02-23 12:11:43 +01:00
2020-05-20 10:04:00 -04:00
2020-04-15 14:29:12 +02:00
2020-06-03 12:27:59 +03:00
2020-05-13 00:00:57 -04:00
2019-11-27 16:29:56 +01:00