Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		2020-06-13 19:41:05 -04:00
..
ExternalPortForwarding.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00
LibraryChangedNotifier.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00
RecordingNotifier.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -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	Use typed logger where possible	2020-06-05 18:15:56 -06:00
UserDataChangeNotifier.cs	Merge branch 'master' into warn17	2020-03-11 20:26:43 +01:00