Patrick Barron 7a115024aa Merge branch 'master' into userdb-efcore ... # Conflicts: # MediaBrowser.Controller/Library/ILibraryManager.cs # MediaBrowser.Providers/Users/UserMetadataService.cs		2020-06-11 18:23:12 -04:00
..
ChapterInfo.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00
CollectionType.cs
DisplayPreferences.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00
ExtraType.cs	Add ExtraType.Unknown enum value and use it instead of null	2020-04-01 18:10:29 +02:00
IHasProviderIds.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00
ImageType.cs	Fix profile images.	2020-05-20 12:09:52 -04:00
IsoType.cs
LibraryUpdateInfo.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00
LocationType.cs
MediaAttachment.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00
MediaStream.cs	Merge branch 'master' into nullable3	2020-05-27 20:49:18 +02:00
MediaStreamType.cs
MediaType.cs
MediaUrl.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00
MetadataFields.cs	Fix a small number of compile warnings	2020-06-09 23:12:53 +01:00
MetadataProvider.cs	Fix a small number of compile warnings	2020-06-06 20:17:49 +01:00
PackageReviewInfo.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00
ParentalRating.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00
PersonType.cs
ProviderIdsExtensions.cs	Fix a small number of compile warnings	2020-06-06 20:17:49 +01:00
ScrollDirection.cs
SeriesStatus.cs	Remove unused usings	2020-03-24 16:12:06 +01:00
SortOrder.cs	Remove unused usings	2020-03-24 16:12:06 +01:00
TrailerType.cs
UserDataSaveReason.cs
Video3DFormat.cs
VideoType.cs
VirtualFolderInfo.cs	Enable nullabe reference types for MediaBrowser.Model	2020-04-05 18:10:56 +02:00