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
..
Api	Fix a bug in Emby.Notifications and clean up	2020-05-26 23:08:27 -04:00
Properties	Adjusted AssemblyCopyright attribute values.	2019-03-14 22:17:56 +01:00
CoreNotificationTypes.cs	Address comments	2020-04-01 19:05:41 +02:00
Emby.Notifications.csproj	Add <ProjectGuid> properties to all project files	2020-04-21 16:21:09 -04:00
NotificationConfigurationFactory.cs	Address comments	2020-04-01 19:05:41 +02:00
NotificationEntryPoint.cs	Use typed logger where possible	2020-06-05 18:15:56 -06:00
NotificationManager.cs	Merge branch 'master' into userdb-efcore	2020-06-13 19:41:05 -04:00