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 42b4f0aa2e Merge branch 'master' into userdb-efcore ... # Conflicts: # Emby.Server.Implementations/Library/UserManager.cs # Jellyfin.Data/Jellyfin.Data.csproj		5 years ago
..
Audio	…
Movies	…
TV	…
AggregateFolder.cs	…
AudioBook.cs	…
BaseItem.cs	Merge branch 'master' into userdb-efcore	5 years ago
BaseItemExtensions.cs	…
BasePluginFolder.cs	…
Book.cs	…
CollectionFolder.cs	…
Extensions.cs	…
Folder.cs	…
Genre.cs	…
ICollectionFolder.cs	…
IHasAspectRatio.cs	…
IHasDisplayOrder.cs	…
IHasMediaSources.cs	…
IHasProgramAttributes.cs	…
IHasScreenshots.cs	…
IHasSeries.cs	…
IHasSpecialFeatures.cs	…
IHasStartDate.cs	…
IHasTrailers.cs	…
IItemByName.cs	…
IMetadataContainer.cs	…
ISupportsBoxSetGrouping.cs	…
ISupportsPlaceHolders.cs	…
InternalItemsQuery.cs	…
InternalPeopleQuery.cs	…
ItemImageInfo.cs	…
LinkedChild.cs	…
MusicVideo.cs	…
PeopleHelper.cs	…
Person.cs	…
PersonInfo.cs	…
Photo.cs	…
PhotoAlbum.cs	…
Share.cs	…
SourceType.cs	…
Studio.cs	…
TagExtensions.cs	…
Trailer.cs	…
UserItemData.cs	…
UserRootFolder.cs	…
UserView.cs	Merge branch 'master' into userdb-efcore	5 years ago
UserViewBuilder.cs	Merge branch 'master' into userdb-efcore	5 years ago
Video.cs	…
Year.cs	…