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-06-01 18:12:49 +03:00
2020-06-04 16:52:23 -04:00
2019-01-17 20:24:39 +01:00
2020-05-20 12:09:52 -04:00
2020-01-21 20:26:30 +01:00
2020-05-22 20:20:18 -04:00
2019-01-13 21:01:16 +01:00