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
..
Attributes
Auth
Constants
Controllers	Merge branch 'master' into ef-cleanup	2021-03-14 10:19:35 -04:00
Extensions	Minor improvements	2021-02-21 02:49:52 +01:00
Helpers	Merge pull request #5403 from BaronGreenback/DLNAProfileFix	2021-03-10 11:50:08 +01:00
ModelBinders
Models	Fix third part integration	2021-03-11 22:45:58 -07:00
WebSocketListeners
BaseJellyfinApiController.cs
Jellyfin.Api.csproj	FxCop -> Net Analyzers (part 1)	2021-03-09 03:04:47 +01:00