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-02-10 17:09:23 -07:00
2020-11-01 20:37:03 -07:00
2020-09-06 09:07:27 -06:00
2020-12-22 15:33:25 +00:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2020-09-06 09:07:27 -06:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00
2021-02-10 17:09:23 -07:00