Patrick Barron 01ce56016a Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj # MediaBrowser.Api/UserService.cs # MediaBrowser.Controller/Library/IUserManager.cs		2020-05-26 20:29:11 -04:00
..
ExternalPortForwarding.cs	Fix merge with master	2020-04-26 16:55:00 -04:00
LibraryChangedNotifier.cs	Remove redundant qualifiers	2020-05-20 13:07:53 -04:00
RecordingNotifier.cs	Initial migration code	2020-05-12 22:10:35 -04:00
ServerEventNotifier.cs	Initial migration code	2020-05-12 22:10:35 -04:00
StartupWizard.cs	Merge branch 'master' into register-services-correctly	2020-04-22 13:05:03 -04:00
UdpServerEntryPoint.cs	Auto discover published URL override	2020-05-02 17:56:09 +01:00
UserDataChangeNotifier.cs	Merge branch 'master' into warn17	2020-03-11 20:26:43 +01:00