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
..
2021-03-13 22:33:28 +01:00
2021-03-13 22:33:28 +01:00
2021-03-13 22:33:28 +01:00
2021-03-13 22:33:28 +01:00