Patrick Barron e5380c653b Merge branch 'master' into ef-cleanup ... # Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj		2021-03-14 10:19:35 -04:00
..
Consumers	Merge branch 'master' into ef-cleanup	2021-03-14 10:19:35 -04:00
EventingServiceCollectionExtensions.cs	Comment and reorder service registration.	2020-08-17 21:48:44 -04:00
EventManager.cs	Gracefully handle exceptions in IEventConsumers	2020-08-15 18:36:37 -04:00