Files
jellyfin/MediaBrowser.Controller/LiveTv
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
..
2019-09-25 17:19:48 +02:00
2020-05-20 13:07:53 -04:00
2019-02-02 21:45:29 +01:00
2020-05-26 22:43:03 -04:00
2020-05-26 22:43:03 -04:00
2019-10-15 17:49:49 +02:00