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-04-05 18:10:56 +02:00
2020-02-23 12:11:43 +01:00
2020-04-05 18:10:56 +02:00
2020-04-01 18:10:29 +02:00
2020-04-05 18:10:56 +02:00
2020-05-20 12:09:52 -04:00
2020-02-04 01:49:27 +01:00
2020-04-05 18:10:56 +02:00
2020-02-04 01:49:27 +01:00
2020-04-05 18:10:56 +02:00
2020-05-27 20:49:18 +02:00
2020-02-04 01:49:27 +01:00
2020-02-04 01:49:27 +01:00
2020-04-05 18:10:56 +02:00
2020-02-04 01:49:27 +01:00
2020-02-23 12:11:43 +01:00
2020-04-05 18:10:56 +02:00
2020-04-05 18:10:56 +02:00
2020-02-04 01:49:27 +01:00
2020-04-20 10:18:12 +02:00
2020-02-04 01:49:27 +01:00
2020-03-24 16:12:06 +01:00
2020-03-24 16:12:06 +01:00
2020-02-23 12:11:43 +01:00
2020-02-04 01:49:27 +01:00
2020-02-23 12:11:43 +01:00
2020-02-04 01:49:27 +01:00
2020-04-05 18:10:56 +02:00