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-29 11:28:19 +02:00
2019-03-13 22:32:52 +01:00
2019-01-13 20:54:44 +01:00
2019-08-29 22:28:33 +02:00
2020-05-29 11:28:19 +02:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2020-06-04 16:52:23 -04:00
2020-05-20 13:07:53 -04:00
2020-06-04 16:52:23 -04:00
2020-05-29 11:28:19 +02:00
2020-06-04 16:52:23 -04:00
2020-06-04 16:52:23 -04:00
2019-11-22 16:15:31 +01:00
2020-05-29 11:28:19 +02:00
2020-05-20 13:07:53 -04:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2019-01-13 20:54:44 +01:00
2020-05-29 11:28:19 +02:00
2019-01-13 20:54:44 +01:00
2020-05-29 11:28:19 +02:00
2020-05-29 11:28:19 +02:00