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
..
Libraries	Merge branch 'master' into ef-cleanup	2021-03-14 10:19:35 -04:00
AccessSchedule.cs	Remove unused factory method	2021-03-06 20:02:42 -05:00
ActivityLog.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00
CustomItemDisplayPreferences.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00
DisplayPreferences.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00
Group.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00
HomeSection.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00
ImageInfo.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00
ItemDisplayPreferences.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00
Permission.cs	Merge branch 'master' into ef-cleanup	2021-03-14 10:19:35 -04:00
Preference.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00
User.cs	Enable nullable for Jellyfin.Data and remove unnecessary attributes	2021-03-06 17:43:01 -05:00