You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Patrick Barron 7a115024aa Merge branch 'master' into userdb-efcore ... # Conflicts: # MediaBrowser.Controller/Library/ILibraryManager.cs # MediaBrowser.Providers/Users/UserMetadataService.cs		4 years ago
..
ChapterInfo.cs	…
CollectionType.cs	…
DisplayPreferences.cs	…
ExtraType.cs	…
IHasProviderIds.cs	…
ImageType.cs	…
IsoType.cs	…
LibraryUpdateInfo.cs	…
LocationType.cs	…
MediaAttachment.cs	…
MediaStream.cs	…
MediaStreamType.cs	…
MediaType.cs	…
MediaUrl.cs	…
MetadataFields.cs	…
MetadataProvider.cs	…
PackageReviewInfo.cs	…
ParentalRating.cs	…
PersonType.cs	…
ProviderIdsExtensions.cs	…
ScrollDirection.cs	…
SeriesStatus.cs	…
SortOrder.cs	…
TrailerType.cs	…
UserDataSaveReason.cs	…
Video3DFormat.cs	…
VideoType.cs	…
VirtualFolderInfo.cs	…