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
..
ExternalPortForwarding.cs	Fix merge with master	2020-04-26 16:55:00 -04:00
LibraryChangedNotifier.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
RecordingNotifier.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
ServerEventNotifier.cs	Merge branch 'master' into userdb-efcore	2020-06-04 16:52:23 -04:00
StartupWizard.cs	Merge branch 'master' into register-services-correctly	2020-04-22 13:05:03 -04:00
UdpServerEntryPoint.cs	Merge pull request #2767 from Bond-009/nullable3	2020-06-03 12:26:54 +03:00
UserDataChangeNotifier.cs	Merge branch 'master' into warn17	2020-03-11 20:26:43 +01:00