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-14 17:03:53 -04:00
2020-03-03 23:07:10 +01:00
2020-05-15 18:33:18 -07:00
2020-02-23 12:11:43 +01:00
2020-05-19 21:45:48 -04:00
2020-06-04 16:52:23 -04:00
2020-02-23 12:11:43 +01:00
2020-06-04 16:52:23 -04:00
2020-05-26 22:43:03 -04:00
2020-05-20 13:07:53 -04:00
2020-04-21 10:18:26 +02:00
2020-04-20 10:18:12 +02:00
2020-05-20 13:07:53 -04:00
2020-05-20 13:07:53 -04:00
2020-05-20 13:07:53 -04:00