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 e5380c653b Merge branch 'master' into ef-cleanup ... # Conflicts: # Jellyfin.Data/Entities/Libraries/MediaFileStream.cs # Jellyfin.Data/Jellyfin.Data.csproj		4 years ago
..
Artwork.cs	…
Book.cs	…
BookMetadata.cs	…
Chapter.cs	…
Collection.cs	Merge branch 'master' into ef-cleanup	4 years ago
CollectionItem.cs	…
Company.cs	…
CompanyMetadata.cs	…
CustomItem.cs	…
CustomItemMetadata.cs	…
Episode.cs	…
EpisodeMetadata.cs	…
Genre.cs	…
ItemMetadata.cs	…
Library.cs	…
LibraryItem.cs	…
MediaFile.cs	…
MediaFileStream.cs	Merge branch 'master' into ef-cleanup	4 years ago
MetadataProvider.cs	…
MetadataProviderId.cs	…
Movie.cs	…
MovieMetadata.cs	…
MusicAlbum.cs	…
MusicAlbumMetadata.cs	…
Person.cs	…
PersonRole.cs	…
Photo.cs	…
PhotoMetadata.cs	…
Rating.cs	…
RatingSource.cs	…
Release.cs	…
Season.cs	…
SeasonMetadata.cs	…
Series.cs	…
SeriesMetadata.cs	…
Track.cs	…
TrackMetadata.cs	…