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-02 16:52:11 +02:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-03-11 20:26:43 +01:00
2020-05-25 23:52:51 +02:00
2020-05-20 13:07:53 -04:00
2020-02-23 12:11:43 +01:00
2019-04-03 22:58:52 -04:00
2020-05-25 23:52:51 +02:00
2020-03-11 20:26:43 +01:00
2020-06-04 16:52:23 -04:00
2020-04-20 13:52:50 +01:00
2019-03-14 22:17:56 +01:00
2020-02-23 12:11:43 +01:00
2020-03-11 20:26:43 +01:00
2020-06-03 12:26:54 +03:00
2020-04-05 21:19:04 +02:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-04-21 16:21:09 -04:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00
2020-02-23 12:11:43 +01:00